Merge pull request #2093 from rappasoft/development

 v3.5.6

Author: lrljoe

.github/workflows/discord-releases.yml

@@ -10,8 +10,10 @@ jobs:
         uses: actions/checkout@v4
       - name: Package Releases
         uses: SethCohen/github-releases-to-discord@latest
+        env: 
+          WEBHOOK_DISCORD_RELEASE_URL: ${{ secrets.WEBHOOK_DISCORD_RELEASE_URL }} 
         with:
-          webhook_url: ${{ secrets.WEBHOOK_DISCORD_RELEASE_URL }}
+          webhook_url: $WEBHOOK_DISCORD_RELEASE_URL
           color: "2105893"
           username: "GitHub Release-Bot"
           avatar_url: "https://cdn.discordapp.com/avatars/487431320314576937/bd64361e4ba6313d561d54e78c9e7171.png"

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

@@ -66,8 +66,10 @@ jobs:
           restore-keys: phpstan-${{ matrix.os }}-PHP${{ matrix.php }}-L${{ matrix.laravel }}-composer-
 
       - name: Add token
+        env: 
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} 
         run: |
-          composer config github-oauth.github.com ${{ secrets.GITHUB_TOKEN }}
+          composer config github-oauth.github.com $GITHUB_TOKEN
           
       - name: Install dependencies
         if: steps.composer-cache.outputs.cache-hit != 'true'

.github/workflows/run-phpstan.yml

@@ -69,8 +69,10 @@ jobs:
           restore-keys: phpstan-${{ matrix.os }}-PHP${{ matrix.php }}-L${{ matrix.laravel }}-composer-
 
       - name: Add token
+        env: 
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} 
         run: |
-          composer config github-oauth.github.com ${{ secrets.GITHUB_TOKEN }}
+          composer config github-oauth.github.com $GITHUB_TOKEN
           
       - name: Install dependencies
         if: steps.composer-cache.outputs.cache-hit != 'true'

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

@@ -71,8 +71,10 @@ jobs:
           restore-keys: ${{ matrix.os }}-PHP${{ matrix.php }}-L${{ matrix.laravel }}-composer-
 
       - name: Add token
+        env: 
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} 
         run: |
-          composer config github-oauth.github.com ${{ secrets.GITHUB_TOKEN }}
+          composer config github-oauth.github.com $GITHUB_TOKEN
           
       - name: Install dependencies
         if: steps.composer-cache.outputs.cache-hit != 'true'
@@ -93,7 +95,7 @@ jobs:
         env:
           CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
         with:
-          token: ${{ secrets.CODECOV_TOKEN }}
+          token: $CODECOV_TOKEN
           files: ./coverage.xml
           verbose: true
 

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

@@ -68,8 +68,10 @@ jobs:
           restore-keys: ${{ matrix.os }}-PHP${{ matrix.php }}-L${{ matrix.laravel }}-composer-
 
       - name: Add token
+        env: 
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} 
         run: |
-          composer config github-oauth.github.com ${{ secrets.GITHUB_TOKEN }}
+          composer config github-oauth.github.com $GITHUB_TOKEN
           
       - name: Install dependencies
         if: steps.composer-cache.outputs.cache-hit != 'true'
@@ -147,8 +149,10 @@ jobs:
           restore-keys: ${{ matrix.os }}-P${{ matrix.php }}-L${{ matrix.laravel }}-composer-
 
       - name: Add token
+        env: 
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} 
         run: |
-          composer config github-oauth.github.com ${{ secrets.GITHUB_TOKEN }}
+          composer config github-oauth.github.com $GITHUB_TOKEN
           
       - name: Install dependencies
         if: steps.composer-cache.outputs.cache-hit != 'true'

.github/workflows/run-tests.yml

@@ -70,8 +70,10 @@ jobs:
           restore-keys: ${{ matrix.os }}-PHP${{ matrix.php }}-L${{ matrix.laravel }}-composer-
 
       - name: Add token
+        env: 
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} 
         run: |
-          composer config github-oauth.github.com ${{ secrets.GITHUB_TOKEN }}
+          composer config github-oauth.github.com $GITHUB_TOKEN
           
       - name: Install dependencies
         if: steps.composer-cache.outputs.cache-hit != 'true'
@@ -149,8 +151,10 @@ jobs:
           restore-keys: ${{ matrix.os }}-PHP${{ matrix.php }}-L${{ matrix.laravel }}-composer-
 
       - name: Add token
+        env: 
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} 
         run: |
-          composer config github-oauth.github.com ${{ secrets.GITHUB_TOKEN }}
+          composer config github-oauth.github.com $GITHUB_TOKEN
           
       - name: Install dependencies
         if: steps.composer-cache.outputs.cache-hit != 'true'

CHANGELOG.md

@@ -2,6 +2,18 @@
 
 All notable changes to `laravel-livewire-tables` will be documented in this file
 
+## [v3.5.6] - 2024-11-28
+### New Features
+- Add Icon to Search Input by @lrljoe in https://github.com/rappasoft/laravel-livewire-tables/pull/2092
+
+### Tweaks
+- Search - Rationalisation of blades into files by @lrljoe in https://github.com/rappasoft/laravel-livewire-tables/pull/2094
+- Columns() Setup Improvements by @lrljoe in https://github.com/rappasoft/laravel-livewire-tables/pull/2089
+- Typehinting in blade components by @edwinvdpol in https://github.com/rappasoft/laravel-livewire-tables/pull/2081
+
+### Testing
+- Tweak Workflows to use an env key by @lrljoe in https://github.com/rappasoft/laravel-livewire-tables/pull/2090
+
 ## [v3.5.5] - 2024-11-22
 ### Bug Fixes
 - Fix date range filter default value by @edwinvdpol in https://github.com/rappasoft/laravel-livewire-tables/pull/2082

docs/search/available-methods.md

@@ -192,3 +192,39 @@ public function configure(): void
     $this->setTrimSearchStringDisabled();
 }
 ```
+
+## Search Icon
+
+To help customise, a "Search Input Icon" has been added, allowing for the addition of an icon to the search input field.
+
+At present, the Search Icon is only available as a "left aligned" icon.
+
+This is presently only available for Tailwind implementations
+
+### setSearchIcon
+
+This adds an Icon to the Search Input Field, which expects an icon path (e.g. heroicon-m-magnifying-glass)
+
+```php
+public function configure(): void
+{
+    $this->setSearchIcon('heroicon-m-magnifying-glass');
+}
+```
+
+### setSearchIconAttributes
+
+This allows you to specify attributes for the Search Icon for the Input Field.
+
+Note that classes will be injected prior to styles, due to the behaviour of icons.
+
+```php
+public function configure(): void
+{
+    $this->setSearchIconAttributes([
+        'class' => 'h-4 w-4',
+        'style' => 'color: #000000',
+    ]);
+}
+
+```

resources/views/components/includes/actions.blade.php

@@ -4,14 +4,14 @@
             ->class(['' => $this->isTailwind && $this->getActionWrapperAttributes['default-colors'] ?? true])
             ->class(['d-flex flex-cols py-2 space-x-2' => $this->isBootstrap && $this->getActionWrapperAttributes['default-styling'] ?? true])
             ->class(['' => $this->isBootstrap && $this->getActionWrapperAttributes['default-colors'] ?? true])
-            ->class(['justify-start' => $this->getActionsPosition == 'left'])
-            ->class(['justify-center' => $this->getActionsPosition == 'center'])
-            ->class(['justify-end' => $this->getActionsPosition == 'right'])
-            ->class(['pl-2' => $this->showActionsInToolbar && $this->getActionsPosition == 'left'])
-            ->class(['pr-2' => $this->showActionsInToolbar && $this->getActionsPosition == 'right'])
+            ->class(['justify-start' => $this->getActionsPosition === 'left'])
+            ->class(['justify-center' => $this->getActionsPosition === 'center'])
+            ->class(['justify-end' => $this->getActionsPosition === 'right'])
+            ->class(['pl-2' => $this->showActionsInToolbar && $this->getActionsPosition === 'left'])
+            ->class(['pr-2' => $this->showActionsInToolbar && $this->getActionsPosition === 'right'])
             ->except(['default','default-styling','default-colors'])
         }} >
     @foreach($this->getActions as $action)
         {{ $action->render() }}
     @endforeach
-</div>
+</div>

resources/views/components/includes/loading.blade.php

@@ -2,9 +2,9 @@
 @props(['colCount' => 1])
 
 @php
-$loaderRow = $this->getLoadingPlaceHolderRowAttributes();
-$loaderCell = $this->getLoadingPlaceHolderCellAttributes();
-$loaderIcon = $this->getLoadingPlaceHolderIconAttributes();
+    $loaderRow = $this->getLoadingPlaceHolderRowAttributes();
+    $loaderCell = $this->getLoadingPlaceHolderCellAttributes();
+    $loaderIcon = $this->getLoadingPlaceHolderIconAttributes();
 @endphp
 
 <tr wire:key="{{ $tableName }}-loader" wire:loading.class.remove="hidden d-none" {{
@@ -27,11 +27,10 @@
                         $attributes->merge($loaderIcon)
                             ->class(['lds-hourglass' => $this->isTailwind && ($loaderIcon['default'] ?? true)])
                             ->class(['lds-hourglass' => $this->isBootstrap && ($loaderIcon['default'] ?? true)])
-                            ->except(['default','default-styling','default-colors']);
+                            ->except(['default','default-styling','default-colors'])
                 }}></div>
                 <div>{!! $this->getLoadingPlaceholderContent() !!}</div>
             </div>
         @endif
     </td>
 </tr>
-