Develop

.github/workflows/php-unit.yml

@@ -13,7 +13,7 @@ jobs:
       matrix:
         os: [ubuntu-22.04]
         php: [8.1, 8.2]
-        laravel: [9.*, 10.*]
+        laravel: [8.*, 9.*, 10.*]
         stability: [prefer-dist]
         exclude:
           - laravel: 10.*
@@ -56,30 +56,35 @@ jobs:
 
       - name: Update dependencies
         if: steps.composer-cache.outputs.cache-hit != 'true'
-        run: composer update --${{ matrix.stability }} --prefer-dist --no-interaction
+        run: composer update --${{ matrix.stability }} --no-interaction
 
       - name: Setup problem matchers
         run: |
           echo "::add-matcher::${{ runner.tool_cache }}/php.json"
           echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"
 
+      - name: Run Unit Tests L8
+        if: startsWith(matrix.laravel, '8') == true
+        run: php -d pcov.enabled=1 ./vendor/bin/paratest --testsuite='Standard' --exclude-group skip8 --passthru-php="'-d pcov.enabled=1'"
+
       - name: Run Unit Tests L9 L10
-        if: ${{ matrix.laravel }} != '8.*'
+        if: startsWith(matrix.laravel, '8') == false
         run: php -d pcov.enabled=1 ./vendor/bin/paratest --testsuite='Standard' --passthru-php="'-d pcov.enabled=1'"
 
       - name: Run PHPStan
+        if: startsWith(matrix.laravel, '8') == false
         run: phpstan analyse src
 
       - name: phpunit-coverage-badge-l9
-        if: ${{ matrix.laravel }} == '9.*'
+        if: startsWith(matrix.laravel, '9') == true
         uses: timkrase/phpunit-coverage-badge@v1.2.1
         with:
           coverage_badge_path: 'docs/images/badges/phpunit-coverage-L9-${{ matrix.php }}-develop.svg'
           push_badge: true
           repo_token: ${{ secrets.GITHUB_TOKEN }}
 
       - name: phpunit-coverage-badge-l10
-        if: ${{ matrix.laravel }} == '10.*'
+        if: startsWith(matrix.laravel, '10') == true
         uses: timkrase/phpunit-coverage-badge@v1.2.1
         with:
           coverage_badge_path: 'docs/images/badges/phpunit-coverage-L10-${{ matrix.php }}-develop.svg'

README.md

@@ -36,13 +36,11 @@ Please see the [Wiki](https://github.com/LowerRockLabs/LaravelLivewireTablesAdva
 # Laravel Support
 | Version | Supported |
 | :---: | :---: | 
-| 8 | ✗  |
+| 8 | ✓  |
 | 9 | ✓  |
 | 10 | ✓  |
 
 
-This package uses Arr::map, which is not supported under Laravel 8.  If there is demand, then a version will be released supporting Laravel 8
-
 # Installation
 This package is available to be installed via Composer
 ```terminal

resources/views/components/tools/filters/datePicker.blade.php

@@ -1,4 +1,3 @@
-@props(['theme'])
 @php
     $tableName = $component->getTableName();
     $filterKey = $filter->getKey();

resources/views/components/tools/filters/numberRange.blade.php

@@ -35,7 +35,7 @@
     wireValues: $wire.entangle('{{ $filterBasePath }}'),
     defaultMin: {{ $minRange }},
     defaultMax: {{ $maxRange }},
-    restrictUpdates: true,
+    restrictUpdates: false,
     setupFilterMenu() {
         let parentLabelElement = document.getElementById('{{ $filterLabelPath }}-label');
         let currentFilterMenuLabel = document.querySelector('{{ $filterMenuLabel }}');
@@ -124,13 +124,10 @@
         this.updateStyles();
     },
     allowUpdates() {
-        this.restrictUpdates = false;
         this.updateWire();
     },
     updateWire() {
         this.updateStyles();
-        if (!this.restrictUpdates) {
-            this.restrictUpdates = true;
             if (this.wireValues != undefined) {
                 if (this.wireValues['min'] != undefined || this.wireValues['max'] != undefined)
                 {
@@ -146,8 +143,6 @@
             else if ($refs.filterMin.value != this.defaultMin || $refs.filterMax.value != this.defaultMax) {
                 this.wireValues = { 'min': $refs.filterMin.value, 'max': $refs.filterMax.value };
             }
-
-        }
     },
     init() {
         this.setupWire();

src/CustomFilter.php

@@ -45,13 +45,32 @@ public function getOptions(): array
      */
     public function config($config = []): CustomFilter
     {
-        $flattened = \Illuminate\Support\Arr::dot($config);
-
-        \Illuminate\Support\Arr::map($flattened, function (string $value, string $key) {
-            \Illuminate\Support\Arr::set($this->config, $key, $value);
-
-            return true;
-        });
+        $version = explode(".", app()->version())[0];
+        if ($version == 8) {
+            foreach ($config as $configIndex => $configValue) {
+                if (! is_array($configValue)) {
+                    $this->config[$configIndex] = $configValue;
+                } else {
+                    foreach ($configValue as $configIndex2 => $configValue2) {
+                        if (! is_array($configValue2)) {
+                            $this->config[$configIndex][$configIndex2] = $configValue2;
+                        } else {
+                            foreach ($configValue2 as $configIndex3 => $configValue3) {
+                                $this->config[$configIndex][$configIndex2][$configIndex3] = $configValue3;
+                            }
+                        }
+                    }
+                }
+            }
+        } else {
+            $flattened = \Illuminate\Support\Arr::dot($config);
+
+            \Illuminate\Support\Arr::map($flattened, function (string $value, string $key) {
+                \Illuminate\Support\Arr::set($this->config, $key, $value);
+
+                return true;
+            });
+        }
 
         return $this;
     }

src/DatePickerFilter.php

@@ -49,13 +49,32 @@ public function getOptions(): array
      */
     public function config($config = []): DatePickerFilter
     {
-        $flattened = \Illuminate\Support\Arr::dot($config);
-
-        \Illuminate\Support\Arr::map($flattened, function (string $value, string $key) {
-            \Illuminate\Support\Arr::set($this->config, $key, $value);
+        $version = explode(".", app()->version())[0];
+        if ($version == 8) {
+            foreach ($config as $configIndex => $configValue) {
+                if (! is_array($configValue)) {
+                    $this->config[$configIndex] = $configValue;
+                } else {
+                    foreach ($configValue as $configIndex2 => $configValue2) {
+                        if (! is_array($configValue2)) {
+                            $this->config[$configIndex][$configIndex2] = $configValue2;
+                        } else {
+                            foreach ($configValue2 as $configIndex3 => $configValue3) {
+                                $this->config[$configIndex][$configIndex2][$configIndex3] = $configValue3;
+                            }
+                        }
+                    }
+                }
+            }
+        } else {
+            $flattened = \Illuminate\Support\Arr::dot($config);
 
-            return true;
-        });
+            \Illuminate\Support\Arr::map($flattened, function (string $value, string $key) {
+                \Illuminate\Support\Arr::set($this->config, $key, $value);
+
+                return true;
+            });
+        }
 
         return $this;
     }

src/DateRangeFilter.php

@@ -62,13 +62,32 @@ public function getOptions(): array
      */
     public function config($config = []): DateRangeFilter
     {
-        $flattened = \Illuminate\Support\Arr::dot($config);
-
-        \Illuminate\Support\Arr::map($flattened, function (string $value, string $key) {
-            \Illuminate\Support\Arr::set($this->config, $key, $value);
+        $version = explode(".", app()->version())[0];
+        if ($version == 8) {
+            foreach ($config as $configIndex => $configValue) {
+                if (! is_array($configValue)) {
+                    $this->config[$configIndex] = $configValue;
+                } else {
+                    foreach ($configValue as $configIndex2 => $configValue2) {
+                        if (! is_array($configValue2)) {
+                            $this->config[$configIndex][$configIndex2] = $configValue2;
+                        } else {
+                            foreach ($configValue2 as $configIndex3 => $configValue3) {
+                                $this->config[$configIndex][$configIndex2][$configIndex3] = $configValue3;
+                            }
+                        }
+                    }
+                }
+            }
+        } else {
+            $flattened = \Illuminate\Support\Arr::dot($config);
 
-            return true;
-        });
+            \Illuminate\Support\Arr::map($flattened, function (string $value, string $key) {
+                \Illuminate\Support\Arr::set($this->config, $key, $value);
+
+                return true;
+            });
+        }
 
         return $this;
     }

src/NumberRangeFilter.php

@@ -49,13 +49,32 @@ public function getOptions(): array
      */
     public function config($config = []): NumberRangeFilter
     {
-        $flattened = \Illuminate\Support\Arr::dot($config);
-
-        \Illuminate\Support\Arr::map($flattened, function (string $value, string $key) {
-            \Illuminate\Support\Arr::set($this->config, $key, $value);
+        $version = explode(".", app()->version())[0];
+        if ($version == 8) {
+            foreach ($config as $configIndex => $configValue) {
+                if (! is_array($configValue)) {
+                    $this->config[$configIndex] = $configValue;
+                } else {
+                    foreach ($configValue as $configIndex2 => $configValue2) {
+                        if (! is_array($configValue2)) {
+                            $this->config[$configIndex][$configIndex2] = $configValue2;
+                        } else {
+                            foreach ($configValue2 as $configIndex3 => $configValue3) {
+                                $this->config[$configIndex][$configIndex2][$configIndex3] = $configValue3;
+                            }
+                        }
+                    }
+                }
+            }
+        } else {
+            $flattened = \Illuminate\Support\Arr::dot($config);
 
-            return true;
-        });
+            \Illuminate\Support\Arr::map($flattened, function (string $value, string $key) {
+                \Illuminate\Support\Arr::set($this->config, $key, $value);
+
+                return true;
+            });
+        }
 
         return $this;
     }

src/SlimSelectFilter.php

@@ -33,13 +33,32 @@ public function __construct(string $name, string $key = null)
      */
     public function config($config = []): SlimSelectFilter
     {
-        $flattened = \Illuminate\Support\Arr::dot($config);
-
-        \Illuminate\Support\Arr::map($flattened, function (string $value, string $key) {
-            \Illuminate\Support\Arr::set($this->config, $key, $value);
-
-            return true;
-        });
+        $version = explode(".", app()->version())[0];
+        if ($version == 8) {
+            foreach ($config as $configIndex => $configValue) {
+                if (! is_array($configValue)) {
+                    $this->config[$configIndex] = $configValue;
+                } else {
+                    foreach ($configValue as $configIndex2 => $configValue2) {
+                        if (! is_array($configValue2)) {
+                            $this->config[$configIndex][$configIndex2] = $configValue2;
+                        } else {
+                            foreach ($configValue2 as $configIndex3 => $configValue3) {
+                                $this->config[$configIndex][$configIndex2][$configIndex3] = $configValue3;
+                            }
+                        }
+                    }
+                }
+            }
+        } else {
+            $flattened = \Illuminate\Support\Arr::dot($config);
+
+            \Illuminate\Support\Arr::map($flattened, function (string $value, string $key) {
+                \Illuminate\Support\Arr::set($this->config, $key, $value);
+
+                return true;
+            });
+        }
 
         return $this;
     }

src/SmartSelectFilter.php

@@ -33,13 +33,32 @@ public function __construct(string $name, string $key = null)
      */
     public function config($config = []): SmartSelectFilter
     {
-        $flattened = \Illuminate\Support\Arr::dot($config);
-
-        \Illuminate\Support\Arr::map($flattened, function (string $value, string $key) {
-            \Illuminate\Support\Arr::set($this->config, $key, $value);
+        $version = explode(".", app()->version())[0];
+        if ($version == 8) {
+            foreach ($config as $configIndex => $configValue) {
+                if (! is_array($configValue)) {
+                    $this->config[$configIndex] = $configValue;
+                } else {
+                    foreach ($configValue as $configIndex2 => $configValue2) {
+                        if (! is_array($configValue2)) {
+                            $this->config[$configIndex][$configIndex2] = $configValue2;
+                        } else {
+                            foreach ($configValue2 as $configIndex3 => $configValue3) {
+                                $this->config[$configIndex][$configIndex2][$configIndex3] = $configValue3;
+                            }
+                        }
+                    }
+                }
+            }
+        } else {
+            $flattened = \Illuminate\Support\Arr::dot($config);
 
-            return true;
-        });
+            \Illuminate\Support\Arr::map($flattened, function (string $value, string $key) {
+                \Illuminate\Support\Arr::set($this->config, $key, $value);
+
+                return true;
+            });
+        }
 
         return $this;
     }