Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

v3.1 #1509

Merged
merged 415 commits into from
Oct 31, 2023
Merged

v3.1 #1509

Changes from 1 commit
Commits
Show all changes
415 commits
Select commit Hold shift + click to select a range
38ec677
Merge pull request #21 from LowerRockLabs/joedev
lrljoe Aug 1, 2023
c20b405
migrating all wire:keys to $tableName prefix
lrljoe Aug 1, 2023
fbad37d
Filter fixes - tableName unaware
lrljoe Aug 1, 2023
724a2b1
TextFilter - test removing component from blade
lrljoe Aug 1, 2023
6624f73
Merge pull request #22 from LowerRockLabs/joedev
lrljoe Aug 1, 2023
b6aa22b
Filter Changes
lrljoe Aug 1, 2023
83d06b7
Fix styling
lrljoe Aug 1, 2023
44ac99a
Add IDs to datatable elements
lrljoe Aug 1, 2023
553122e
More missing/broken wire keys
lrljoe Aug 1, 2023
91d32e8
Reorderable - Fully Fixed!!!
lrljoe Aug 1, 2023
f8482ff
Further improvements to red space removal
lrljoe Aug 1, 2023
1c9e54f
Merge pull request #23 from LowerRockLabs/joedev
lrljoe Aug 1, 2023
de58ea2
Move CSS into file
lrljoe Aug 1, 2023
b2d29de
Fix styling
lrljoe Aug 1, 2023
b4b5140
Migrating functions for JS &CSS Publishing
lrljoe Aug 1, 2023
9970cad
Fix styling
lrljoe Aug 1, 2023
cb0ad21
Adding NumberRange Filter
lrljoe Aug 1, 2023
dc5ba9a
Fix styling
lrljoe Aug 1, 2023
5a02937
Test Commit - Wire Key Fixes
lrljoe Aug 1, 2023
7170bc8
Merge pull request #24 from LowerRockLabs/joedev
lrljoe Aug 1, 2023
09dccc3
Updates
rappasoft Aug 1, 2023
ec69e30
Styling for NumberRange Filter
lrljoe Aug 1, 2023
9b8df8c
Fix styling
lrljoe Aug 1, 2023
2aac4fb
Fixes for reorder - starting to strip out old code
lrljoe Aug 1, 2023
f73f64f
Cleanup
rappasoft Aug 2, 2023
994047c
Merge branch 'filterTidy' into rappa
rappasoft Aug 2, 2023
825af2f
Merge pull request #25 from LowerRockLabs/rappa
lrljoe Aug 2, 2023
f6733fa
Merge branch 'joedev' into filterTidy
lrljoe Aug 2, 2023
80b7f7c
Merge pull request #26 from LowerRockLabs/filterTidy
lrljoe Aug 2, 2023
33f9f6b
JS Update, Debouncing Drag, and Doc Start
lrljoe Aug 2, 2023
d57cdb6
Test Fixes
lrljoe Aug 2, 2023
35b71c0
Fix styling
lrljoe Aug 2, 2023
b74d5e7
PHPUnit Tests
lrljoe Aug 2, 2023
6fcef8b
Update PHPUnit - PCOV
lrljoe Aug 2, 2023
c791dba
pcov update
lrljoe Aug 2, 2023
b2f8be7
coverage
lrljoe Aug 2, 2023
ebfbcfb
Fix reorder blade
lrljoe Aug 2, 2023
04ed5e6
PHPUnit Amendments
lrljoe Aug 2, 2023
4824bab
Add PCOV
lrljoe Aug 2, 2023
8982224
Remove configuration reference
lrljoe Aug 2, 2023
e2fd1b0
Tests yet again
lrljoe Aug 2, 2023
f4ff28e
PHPUnit
lrljoe Aug 2, 2023
5cd58ae
More pcov testing
lrljoe Aug 2, 2023
453d009
Test tweaks
lrljoe Aug 2, 2023
34841e5
Fix styling
lrljoe Aug 2, 2023
156dd9f
Remove report section
lrljoe Aug 2, 2023
817c64c
Remove Laravel 11 as an option due to bladeicons
lrljoe Aug 2, 2023
d049346
Tweaks to codecov
lrljoe Aug 2, 2023
7aff8d8
Typehinting Filters, Adding dateFormat options
lrljoe Aug 2, 2023
378aa3a
Fix styling
lrljoe Aug 2, 2023
fa1cad7
Fix
rappasoft Aug 2, 2023
8b93c43
Merge branch 'filterTidy' into joedev
lrljoe Aug 2, 2023
3e5bcd3
fix multiselect typehint
lrljoe Aug 2, 2023
5caafd5
Adjusting for failing tests
lrljoe Aug 2, 2023
bff6dd8
Fix styling
lrljoe Aug 2, 2023
07f7c0b
All text filter return numeric
lrljoe Aug 2, 2023
8d4848d
Merge branch 'joedev' of https://github.com/LowerRockLabs/laravel-liv…
lrljoe Aug 2, 2023
9d7360e
Fix Select Filter
lrljoe Aug 2, 2023
fd2b30c
Rolling back filter typehinting
lrljoe Aug 2, 2023
1794c10
Merge pull request #27 from LowerRockLabs/joedev
lrljoe Aug 2, 2023
0dc17b0
Always submit to pcov
lrljoe Aug 2, 2023
05a37ce
Merge pull request #28 from LowerRockLabs/joedev
lrljoe Aug 2, 2023
fa056cc
Add Date Range & Adjust NumberRange
lrljoe Aug 2, 2023
d6da479
Fix styling
lrljoe Aug 2, 2023
16be5b3
Merge pull request #30 from LowerRockLabs/joedev
lrljoe Aug 2, 2023
a95ad57
Add TableAlias, LW Col, FilterTest, HideReorderCol
lrljoe Aug 2, 2023
c3cf6a3
Fix styling
lrljoe Aug 2, 2023
273d45a
Merge pull request #31 from LowerRockLabs/joedev
lrljoe Aug 2, 2023
f05538b
Add PHPStan & CodeCov README (filterTidy branch)
lrljoe Aug 3, 2023
e45d746
getConfigs() and getOptions() - check config file
lrljoe Aug 4, 2023
92e5d08
Fix styling
lrljoe Aug 4, 2023
647b84a
Add NumberRangeFilterTest
lrljoe Aug 4, 2023
4009dfe
Fix styling
lrljoe Aug 4, 2023
69e2d59
Updating Tests for NumberRange
lrljoe Aug 4, 2023
d62de24
Fix styling
lrljoe Aug 4, 2023
45e3e64
Test Fixes
lrljoe Aug 4, 2023
74fc2e0
Fix styling
lrljoe Aug 4, 2023
c50b5b0
Hide collapsing icon in header
lrljoe Aug 5, 2023
ebfc627
Fix BS4/BS5 collapsing
lrljoe Aug 5, 2023
a3dc387
Merge pull request #32 from LowerRockLabs/joedev
lrljoe Aug 5, 2023
dc15c33
Add DateRangeFilter Flatpickr JS
lrljoe Aug 5, 2023
a6cd7a9
Fix issue with retrieving primaryKey for Model
lrljoe Aug 5, 2023
953f6e4
Add capability to set Search placeholder
lrljoe Aug 5, 2023
c7c56c9
TypeHinting Fixes
lrljoe Aug 5, 2023
f2058e1
Fix styling
lrljoe Aug 5, 2023
0da089d
+ dateFilter option for DateFilter/DateTimeFilter
lrljoe Aug 5, 2023
24cc079
Merge pull request #33 from LowerRockLabs/joedev
lrljoe Aug 5, 2023
fe33399
Type Hint Fixes, Add SaveState, Rem Reorder Q
lrljoe Aug 6, 2023
992c758
Fix styling
lrljoe Aug 6, 2023
2aff94f
Reordering - Reverting to "Everything" for now
lrljoe Aug 6, 2023
356e1d3
Fix styling
lrljoe Aug 6, 2023
1b19f45
Splitting Injection into multiple traits
lrljoe Aug 6, 2023
bc7f77f
Fix styling
lrljoe Aug 6, 2023
c1b374d
Add third party default files
lrljoe Aug 6, 2023
0d3c837
Fix typo in trait
lrljoe Aug 6, 2023
da34ae7
Adjust getSorts to only return sortable cols
lrljoe Aug 6, 2023
5aa468c
Fix styling
lrljoe Aug 6, 2023
8d22b31
Test Self-Hosted
lrljoe Aug 7, 2023
17ba2b4
Testing self-hosted with pcov
lrljoe Aug 7, 2023
4cd2937
Tests for PCOV
lrljoe Aug 7, 2023
70171e9
PCOV Tests
lrljoe Aug 7, 2023
1bab0d8
Roll back PCOV Changes
lrljoe Aug 7, 2023
0756949
Bump workflows to ubuntu-latest
lrljoe Aug 7, 2023
4a234b7
TypeHint Fixes
lrljoe Aug 7, 2023
70f8674
Adjusting typehinting for filters
lrljoe Aug 7, 2023
9a10f6a
Fixing FIlter Return Type Mistakes
lrljoe Aug 7, 2023
53330f7
Fix styling
lrljoe Aug 7, 2023
d9f0c6b
Tweak for testing runner
lrljoe Aug 7, 2023
8a6a543
Test on runner
lrljoe Aug 7, 2023
4bb10e7
Test with ghrun
lrljoe Aug 7, 2023
adef1b2
ghrun workflow tests
lrljoe Aug 7, 2023
047f5f7
Move pcov pull into its own workflow
lrljoe Aug 7, 2023
98b3d1f
More typehint/return type fixes
lrljoe Aug 7, 2023
550cf4d
Fix styling
lrljoe Aug 7, 2023
057352c
Adjustments to naming & flatpickr Includes
lrljoe Aug 13, 2023
712fc5b
Update typehints for v5
lrljoe Aug 13, 2023
727a294
Ignore listeners
lrljoe Aug 13, 2023
06b1660
Fix styling
lrljoe Aug 13, 2023
0a94ece
Typehint and ReturnType fixes
lrljoe Aug 13, 2023
5afe70d
Merge pull request #34 from LowerRockLabs/joedev
lrljoe Aug 13, 2023
0938527
Allow publishing, remote or local FlatpickrJS
lrljoe Aug 13, 2023
558a259
Fix styling
lrljoe Aug 13, 2023
e207f06
Add options for toggling custom files
lrljoe Aug 13, 2023
dd0d1b1
Add options for toggling custom files
lrljoe Aug 13, 2023
1d2cacb
Fix styling
lrljoe Aug 13, 2023
c50a2ba
Additional Fixes - NumberRange
lrljoe Aug 17, 2023
18451c2
Fix styling
lrljoe Aug 17, 2023
5825b25
Merge pull request #35 from LowerRockLabs/joedev
lrljoe Aug 17, 2023
ff800eb
Adjusting script/style paths, and cache duration
lrljoe Aug 18, 2023
d07aa3c
Fix styling
lrljoe Aug 18, 2023
2dc9598
Reorder fixes - if 0 rows, regenerate stripe classes
lrljoe Aug 19, 2023
43c762c
Tweak to ensure no breaking of layouts
lrljoe Aug 19, 2023
c1744e2
Fix styling
lrljoe Aug 19, 2023
1e1e959
Remove superfluous character in file path
lrljoe Aug 19, 2023
b1156a0
Re-fix errant /n
lrljoe Aug 19, 2023
59d847d
Documentation Updates for Filters
lrljoe Aug 19, 2023
9362d0e
Remove filter for sortable columns
lrljoe Aug 21, 2023
32071eb
PHPStan to Level 5 rather than 6
lrljoe Aug 21, 2023
90f83ee
Merge pull request #38 from LowerRockLabs/joedev
lrljoe Aug 21, 2023
1af1dcd
ChangeLog, Tests, DateFilter Format, DateRange Fix
lrljoe Aug 22, 2023
92e222c
Fix styling
lrljoe Aug 22, 2023
bc6e8d9
Filter Test Tweaks
lrljoe Aug 22, 2023
a0f8d67
Fix styling
lrljoe Aug 22, 2023
7912d72
ChangeLog Update
lrljoe Aug 22, 2023
be819f6
Fix test mistake in NumberRange
lrljoe Aug 22, 2023
1979e64
Merge pull request #39 from LowerRockLabs/joedev
lrljoe Aug 22, 2023
53668c2
Docs, Config , --"options" from Date/Datetime
lrljoe Aug 22, 2023
238987b
Update array order for DateRangeFilter
lrljoe Aug 22, 2023
c25ab54
Fix missing comma
lrljoe Aug 22, 2023
f296346
Fix styling
lrljoe Aug 22, 2023
c5c9575
Merge pull request #40 from LowerRockLabs/joedev
lrljoe Aug 22, 2023
0bdcba5
Add setFilterDefaultValue to dates
lrljoe Aug 22, 2023
92391fb
Add setFilterDefaultValue
lrljoe Aug 22, 2023
250471d
Merge pull request #41 from LowerRockLabs/joedev
lrljoe Aug 22, 2023
932d7aa
Add collapsing test, remove getConfigs() from NR
lrljoe Aug 22, 2023
0a93569
Fix styling
lrljoe Aug 22, 2023
99cfc9c
Merge pull request #42 from LowerRockLabs/joedev
lrljoe Aug 22, 2023
8842fc4
Add defaultValue Tests
lrljoe Aug 22, 2023
52aaa7a
Fix styling
lrljoe Aug 22, 2023
581cc89
Fix filterDefaultValue tests
lrljoe Aug 22, 2023
0d293eb
Merge pull request #43 from LowerRockLabs/joedev
lrljoe Aug 22, 2023
3619c3e
Add setDefaultFilterValue test for SelectFilter
lrljoe Aug 22, 2023
1903760
setFilterDefaultValue for NumberFilterTest
lrljoe Aug 22, 2023
fda28ac
+setFilterDefault test MultiSelectDropdownFilter
lrljoe Aug 22, 2023
74e9355
Fix type for defaultValue
lrljoe Aug 22, 2023
ec95fc6
Fix MultiSelectTest missing $optionsArray
lrljoe Aug 22, 2023
45560fa
Fix test for setFilterDefaultValue for MSDD
lrljoe Aug 22, 2023
2d340e3
Merge pull request #44 from LowerRockLabs/joedev
lrljoe Aug 22, 2023
ef113bd
Add 3.x or dev-main for Livewire 3.0
lrljoe Aug 25, 2023
a545219
Removing errant name for package
lrljoe Aug 26, 2023
23e73c2
Search Behaviours (#1320)
lrljoe Aug 28, 2023
1d1da19
Beta Fixes - Publishing Views/Localizations. Beta Improvements - Sea…
lrljoe Aug 31, 2023
4250511
Beta Fixes - Publishing Views/Localizations. Beta Improvements - Sea…
lrljoe Sep 1, 2023
135297e
Bulk Actions Fix - v3 (#1326)
lrljoe Sep 3, 2023
3967e15
Fix Column Select - Select All state (#1333)
lrljoe Sep 3, 2023
648a6ca
Merge branch 'v3-master' into v3-develop
lrljoe Sep 3, 2023
4ee351e
Add NonArray setAdditionalSelects Test (#1337)
lrljoe Sep 3, 2023
32556cd
Test Additions (#1339)
lrljoe Sep 3, 2023
9ec84f1
Add Third Party Tests (#1340)
lrljoe Sep 3, 2023
74b547c
Third Party Asset Tests (#1341)
lrljoe Sep 4, 2023
b68ab26
Lazy Loading Fix (#1355)
lrljoe Sep 17, 2023
e609f13
Spacing fixes
rappasoft Sep 18, 2023
d6e6512
v3 - Missing Tests - Pagination Related Tests (#1363)
lrljoe Sep 21, 2023
ae87ac2
v3 - Missing Tests - Broken Tables (Missing Primary Key/Builder) (#1362)
lrljoe Sep 21, 2023
e2a3199
v3 - Add setSearchFieldAttribute Options (#1361)
lrljoe Sep 22, 2023
e7c10c1
v3 - Column Select Fixes & Tweaks (#1360)
lrljoe Sep 22, 2023
62db217
Fix ServiceProvider Fault (#1366)
lrljoe Sep 23, 2023
65ce494
V3 Frontend Asset Tweaks (#1371)
lrljoe Sep 26, 2023
19b79b2
V3 - Reordering Fixes (#1373)
lrljoe Sep 26, 2023
9cdf451
Bundler Import Options (#1377)
lrljoe Sep 28, 2023
6c977c4
V3 Restore setTrAttributes (#1378)
lrljoe Oct 1, 2023
003ab4a
Develop to Master - V3 Fixes - Bulk Actions, Column Select, Injectors…
lrljoe Oct 3, 2023
1e6c159
Update Reorder Documentation (#1381)
lrljoe Oct 3, 2023
32de139
Merge branch 'v3-master' into v3-develop
lrljoe Oct 3, 2023
04aa7bd
V3 Develop to V3 Master (#1382)
lrljoe Oct 3, 2023
66ece40
Update Docs - Advanced Example, Add Including Assets (#1383)
lrljoe Oct 4, 2023
a4fa8d6
V3 develop (#1384)
lrljoe Oct 4, 2023
c519a09
Update
rappasoft Oct 4, 2023
154f726
Fix DateRangeFilter Blade Items (#1394)
lrljoe Oct 6, 2023
16ccfe1
Add setFilterLabelAttributes Capability (#1397)
lrljoe Oct 8, 2023
323deee
Merge branch 'v3-master' into v3-develop
lrljoe Oct 8, 2023
429b54f
v3 - Apply Reorder Sorting When Reordering (#1402)
lrljoe Oct 8, 2023
babe430
v3-develop to v3-master (#1399)
lrljoe Oct 8, 2023
eff02e4
v3 - Fix Unrequired Update Call (#1407)
lrljoe Oct 13, 2023
1b1d574
v3 - Adding CollapseAlways Option for Columns (#1403)
lrljoe Oct 13, 2023
9d42d0f
Merge branch 'v3-master' into v3-develop
lrljoe Oct 13, 2023
31ae8fe
Minor tweaks to blades for reorder cols (#1411)
lrljoe Oct 13, 2023
c0f00ea
V3 - Fix Reorder For Bootstrap (#1412)
lrljoe Oct 13, 2023
4985e9b
V3 Develop to Master -> LW3.0.6 Fixes & collapseAlways (#1410)
lrljoe Oct 13, 2023
bbd73cd
Add DiscordBot (#1413)
lrljoe Oct 13, 2023
11b7afc
V3 Beta Develop to Master (#1414)
lrljoe Oct 13, 2023
94df54c
Docs livewire namespace fix (#1420)
amshehzad Oct 14, 2023
1cab8c4
V3 - Fix Localisation (#1424)
lrljoe Oct 17, 2023
cb2d9c9
v3 - Add Loading Placeholder (#1421)
lrljoe Oct 17, 2023
c972b20
Merge branch 'v3-master' into v3-develop
lrljoe Oct 17, 2023
707b6b8
v3-Develop to v3-Master - Beta 004 (#1425)
lrljoe Oct 17, 2023
b4c07dc
v3 - Column - Allow Enum in ReturnType for Column getContent/renderCo…
lrljoe Oct 23, 2023
5dffbe3
v3 - Add "Confirmation" Option to Bulk Actions (#1437)
lrljoe Oct 25, 2023
be31564
Merge branch 'v3-master' into v3-develop
lrljoe Oct 25, 2023
ca4ddd5
V3 Develop to V3 Master (#1439)
lrljoe Oct 25, 2023
4396c44
Collapsing Header Fix (#1441)
lrljoe Oct 25, 2023
87cc153
Merge branch 'v3-master' into v3-develop
lrljoe Oct 25, 2023
d7126bc
v3.0.0-beta.6 (#1442)
lrljoe Oct 25, 2023
53ec8d8
V3 - Additional Fixes for Collapsing header (#1443)
lrljoe Oct 25, 2023
6fbd20e
Merge branch 'v3-master' into v3-develop
lrljoe Oct 25, 2023
da3beab
Beta 6 - Dev to Master (#1444)
lrljoe Oct 25, 2023
2e14794
V3 - Add Clickable Row Using wire:navigate (#1446)
lrljoe Oct 25, 2023
9d41ff6
v3 Beta.7 - Develop to Merge (#1447)
lrljoe Oct 25, 2023
cbbb283
Fix for setFilter (#1449)
lrljoe Oct 25, 2023
6b8fbf1
Merge branch 'v3-develop' into v3-master
lrljoe Oct 25, 2023
bdb9b8b
v3 - Fix - Correct setFilter behaviour (#1451)
lrljoe Oct 25, 2023
6427cb5
v3 - Fix - Correct setFilter behaviour (#1451) (#1452)
lrljoe Oct 25, 2023
24f348a
Fixes for missing brackets (#1455)
lrljoe Oct 26, 2023
94b2cc9
Beta.9 - Develop to Master (#1456)
lrljoe Oct 26, 2023
dc2961a
v3 Toolbar - Splitting of Views/Blades (#1454)
lrljoe Oct 27, 2023
3bd9e4a
Fix missing BootStrap Classes from Toolbar Blade (#1466)
lrljoe Oct 27, 2023
f192e64
Adding x-cloak where it is missing for x-show (#1463)
lrljoe Oct 27, 2023
3601838
V3 - QueryString migration into Traits (#1465)
lrljoe Oct 27, 2023
5a2c14e
Update Changelog (#1467)
lrljoe Oct 27, 2023
cf20177
V3 - Develop to Master - Toolbar splitting (#1461)
lrljoe Oct 27, 2023
ec1f7bd
v3 DateRange - Icon Styling, FilterHelper Method (#1490)
lrljoe Oct 28, 2023
0cc1dea
V3 DateRangeFilter - Remove Icon, Add Placeholder (#1492)
lrljoe Oct 28, 2023
11ae25b
Use FilterHelper method to generate wire:key, add placeholder with do…
lrljoe Oct 29, 2023
9522dc8
Minor tweaks to toolbar/column select styling (#1494)
lrljoe Oct 29, 2023
9eb5d62
Merge branch 'v3-master' into v3-develop
lrljoe Oct 29, 2023
dc254a3
v3.0.0-beta.11 Merge (#1499)
lrljoe Oct 29, 2023
743129d
v3-RestoreBulkActionConfirm (#1500)
lrljoe Oct 29, 2023
0a52088
Merge branch 'v3-master' into v3-develop
lrljoe Oct 29, 2023
ba322d3
v3.1.0 Release (#1505)
lrljoe Oct 31, 2023
2f07552
Merge pull request #1507 from rappasoft/v3-develop
rappasoft Oct 31, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 4 additions & 8 deletions resources/views/components/tools/filters/date.blade.php
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
@php
$filterLayout = $component->getFilterLayout();
$tableName = $component->getTableName();
@endphp

<div>
@if($filter->hasCustomFilterLabel() && !$filter->hasCustomPosition())
@@ -11,8 +7,8 @@
@endif

<div @class([
"rounded-md shadow-sm" => $component->isTailwind(),
"mb-3 mb-md-0 input-group" => $component->isBootstrap(),
"rounded-md shadow-sm" => $isTailwind,
"mb-3 mb-md-0 input-group" => $isBootstrap,
])
>
<input
@@ -23,8 +19,8 @@
@if($filter->hasConfig('min')) min="{{ $filter->getConfig('min') }}" @endif
@if($filter->hasConfig('max')) max="{{ $filter->getConfig('max') }}" @endif
@class([
"block w-full border-gray-300 rounded-md 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-800 dark:text-white dark:border-gray-600" => $component->isTailwind(),
"form-control" => $component->isBootstrap(),
"block w-full border-gray-300 rounded-md 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-800 dark:text-white dark:border-gray-600" => $isTailwind,
"form-control" => $isBootstrap,
])
/>
</div>
12 changes: 4 additions & 8 deletions resources/views/components/tools/filters/datetime.blade.php
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
@php
$filterLayout = $component->getFilterLayout();
$tableName = $component->getTableName();
@endphp

<div>
@if($filter->hasCustomFilterLabel() && !$filter->hasCustomPosition())
@@ -11,8 +7,8 @@
@endif

<div @class([
"rounded-md shadow-sm" => $component->isTailwind(),
"mb-3 mb-md-0 input-group" => $component->isBootstrap(),
"rounded-md shadow-sm" => $isTailwind,
"mb-3 mb-md-0 input-group" => $isBootstrap,
])
>
<input
@@ -23,8 +19,8 @@
@if($filter->hasConfig('min')) min="{{ $filter->getConfig('min') }}" @endif
@if($filter->hasConfig('max')) max="{{ $filter->getConfig('max') }}" @endif
@class([
"block w-full border-gray-300 rounded-md 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-800 dark:text-white dark:border-gray-600" => $component->isTailwind(),
"form-control" => $component->isBootstrap(),
"block w-full border-gray-300 rounded-md 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-800 dark:text-white dark:border-gray-600" => $isTailwind,
"form-control" => $isBootstrap,
])
/>
</div>
Original file line number Diff line number Diff line change
@@ -1,16 +1,11 @@
@php
$filterLayout = $component->getFilterLayout();
$tableName = $component->getTableName();
@endphp

<div>
@if($filter->hasCustomFilterLabel() && !$filter->hasCustomPosition())
@include($filter->getCustomFilterLabel(),['filter' => $filter, 'filterLayout' => $filterLayout, 'tableName' => $tableName ])
@elseif(!$filter->hasCustomPosition())
<x-livewire-tables::tools.filter-label :filter="$filter" :filterLayout="$filterLayout" :tableName="$tableName" />
@endif

@if ($component->isTailwind())
@if ($isTailwind)
<div class="rounded-md shadow-sm">
<select multiple
wire:model.live.debounce.250ms="filterComponents.{{ $filter->getKey() }}"
@@ -34,12 +29,12 @@ class="block w-full transition duration-150 ease-in-out border-gray-300 rounded-
@endforeach
</select>
</div>
@elseif ($component->isBootstrap())
@elseif ($isBootstrap)
<select multiple
wire:model.live.debounce.250ms="filterComponents.{{ $filter->getKey() }}"
wire:key="{{ $tableName }}-filter-{{ $filter->getKey() }}@if($filter->hasCustomPosition())-{{ $filter->getCustomPosition() }}@endif"
id="{{ $tableName }}-filter-{{ $filter->getKey() }}@if($filter->hasCustomPosition())-{{ $filter->getCustomPosition() }}@endif"
class="{{ $component->isBootstrap4() ? 'form-control' : 'form-select' }}"
class="{{ $isBootstrap4 ? 'form-control' : 'form-select' }}"
>
@if ($filter->getFirstOption() != "")
<option @if($filter->isEmpty($this)) selected @endif value="all">{{ $filter->getFirstOption()}}</option>
13 changes: 2 additions & 11 deletions resources/views/components/tools/filters/multi-select.blade.php
Original file line number Diff line number Diff line change
@@ -1,23 +1,17 @@
@php
$filterLayout = $component->getFilterLayout();
$tableName = $component->getTableName();
@endphp

<div>
@if($filter->hasCustomFilterLabel() && !$filter->hasCustomPosition())
@include($filter->getCustomFilterLabel(),['filter' => $filter, 'filterLayout' => $filterLayout, 'tableName' => $tableName ])
@elseif(!$filter->hasCustomPosition())
<x-livewire-tables::tools.filter-label :filter="$filter" :filterLayout="$filterLayout" :tableName="$tableName" />
@endif

@if ($component->isTailwind())
@if ($isTailwind)
<div class="rounded-md">
<div>
<input
type="checkbox"
id="{{ $tableName }}-filter-{{ $filter->getKey() }}@if($filter->hasCustomPosition())-{{ $filter->getCustomPosition() }}@endif-select-all"
wire:input="selectAllFilterOptions('{{ $filter->getKey() }}')"
{{ count($component->getAppliedFilterWithValue($filter->getKey()) ?? []) === count($filter->getOptions()) ? 'checked' : ''}}
class="text-indigo-600 rounded border-gray-300 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 disabled:opacity-50 disabled:cursor-wait"
>
<label for="{{ $tableName }}-filter-{{ $filter->getKey() }}@if($filter->hasCustomPosition())-{{ $filter->getCustomPosition() }}@endif-select-all" class="dark:text-white">@lang('All')</label>
@@ -31,21 +25,18 @@ class="text-indigo-600 rounded border-gray-300 shadow-sm transition duration-150
value="{{ $key }}"
wire:key="{{ $tableName }}-filter-{{ $filter->getKey() }}@if($filter->hasCustomPosition())-{{ $filter->getCustomPosition() }}@endif-{{ $loop->index }}"
wire:model.live.debounce.250ms="filterComponents.{{ $filter->getKey() }}"
{{ count($component->getAppliedFilterWithValue($filter->getKey()) ?? []) === count($filter->getOptions()) ? 'disabled' : ''}}
:class="{'disabled:bg-gray-400 disabled:hover:bg-gray-400' : {{ count($component->getAppliedFilterWithValue($filter->getKey()) ?? []) === count($filter->getOptions()) ? 'true' : 'false' }}}"
class="text-indigo-600 rounded border-gray-300 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 disabled:opacity-50 disabled:cursor-wait"
>
<label for="{{ $tableName }}-filter-{{ $filter->getKey() }}@if($filter->hasCustomPosition())-{{ $filter->getCustomPosition() }}@endif-{{ $loop->index }}" class="dark:text-white">{{ $value }}</label>
</div>
@endforeach
</div>
@elseif ($component->isBootstrap())
@elseif ($isBootstrap)
<div class="form-check">
<input
type="checkbox"
id="{{ $tableName }}-filter-{{ $filter->getKey() }}@if($filter->hasCustomPosition())-{{ $filter->getCustomPosition() }}@endif-select-all"
wire:input="selectAllFilterOptions('{{ $filter->getKey() }}')"
{{ count($component->getAppliedFilterWithValue($filter->getKey()) ?? []) === count($filter->getOptions()) ? 'checked' : ''}}
class="form-check-input"
>
<label class="form-check-label" for="{{ $tableName }}-filter-{{ $filter->getKey() }}@if($filter->hasCustomPosition())-{{ $filter->getCustomPosition() }}@endif-select-all">@lang('All')</label>
13 changes: 4 additions & 9 deletions resources/views/components/tools/filters/number.blade.php
Original file line number Diff line number Diff line change
@@ -1,8 +1,3 @@
@php
$filterLayout = $component->getFilterLayout();
$tableName = $component->getTableName();
@endphp

<div>
@if($filter->hasCustomFilterLabel() && !$filter->hasCustomPosition())
@include($filter->getCustomFilterLabel(),['filter' => $filter, 'filterLayout' => $filterLayout, 'tableName' => $tableName ])
@@ -11,8 +6,8 @@
@endif

<div @class([
"rounded-md shadow-sm" => $component->isTailwind(),
"mb-3 mb-md-0 input-group" => $component->isBootstrap(),
"rounded-md shadow-sm" => $isTailwind,
"mb-3 mb-md-0 input-group" => $isBootstrap,
])
>
<input
@@ -23,8 +18,8 @@
@if($filter->hasConfig('min')) min="{{ $filter->getConfig('min') }}" @endif
@if($filter->hasConfig('max')) max="{{ $filter->getConfig('max') }}" @endif
@class([
"block w-full border-gray-300 rounded-md 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-800 dark:text-white dark:border-gray-600" => $component->isTailwind(),
"form-control" => $component->isBootstrap(),
"block w-full border-gray-300 rounded-md 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-800 dark:text-white dark:border-gray-600" => $isTailwind,
"form-control" => $isBootstrap,
])
/>
</div>
16 changes: 5 additions & 11 deletions resources/views/components/tools/filters/select.blade.php
Original file line number Diff line number Diff line change
@@ -1,9 +1,3 @@
@aware(['tableName'])
@php
$filterLayout = $component->getFilterLayout();
$tableName = $component->getTableName();
@endphp

<div>
@if($filter->hasCustomFilterLabel() && !$filter->hasCustomPosition())
@include($filter->getCustomFilterLabel(),['filter' => $filter, 'filterLayout' => $filterLayout, 'tableName' => $tableName ])
@@ -12,18 +6,18 @@
@endif

<div @class([
'rounded-md shadow-sm' => $component->isTailwind(),
'inline' => $component->isBootstrap(),
'rounded-md shadow-sm' => $isTailwind,
'inline' => $isBootstrap,
])
>
<select
wire:model.live="filterComponents.{{ $filter->getKey() }}"
wire:key="{{ $tableName }}-filter-{{ $filter->getKey() }}@if($filter->hasCustomPosition())-{{ $filter->getCustomPosition() }}@endif"
id="{{ $tableName }}-filter-{{ $filter->getKey() }}@if($filter->hasCustomPosition())-{{ $filter->getCustomPosition() }}@endif"
@class([
'block w-full border-gray-300 rounded-md 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-800 dark:text-white dark:border-gray-600' => $component->isTailwind(),
'form-control' => $component->isBootstrap4(),
'form-select' => $component->isBootstrap5(),
'block w-full border-gray-300 rounded-md 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-800 dark:text-white dark:border-gray-600' => $isTailwind,
'form-control' => $isBootstrap4,
'form-select' => $isBootstrap5,
])
>
@foreach($filter->getOptions() as $key => $value)
8 changes: 4 additions & 4 deletions resources/views/components/tools/toolbar.blade.php
Original file line number Diff line number Diff line change
@@ -95,7 +95,7 @@ class="origin-top-left absolute left-0 mt-2 w-full md:w-56 rounded-md shadow-lg
<div class="py-1" role="none">
<div class="block px-4 py-2 text-sm text-gray-700 space-y-1" role="menuitem"
id="{{ $tableName }}-filter-{{ $filter->getKey() }}-wrapper">
{{ $filter->render($component) }}
{{ $filter->render($component->filterLayout, $tableName, $component->isTailwind(), $component->isBootstrap4(), $component->isBootstrap5()) }}
</div>
</div>
@endforeach
@@ -292,7 +292,7 @@ class="block w-full border-gray-300 rounded-md shadow-sm transition duration-150
$filter->getFilterSlidedownColspan() == 3,
])
id="{{ $tableName }}-filter-{{ $filter->getKey() }}-wrapper">
{{ $filter->render($component) }}
{{ $filter->render($component->filterLayout, $tableName, $component->isTailwind(), $component->isBootstrap4(), $component->isBootstrap5()) }}
</div>
@endforeach
</div>
@@ -435,7 +435,7 @@ class="block w-full border-gray-300 rounded-md shadow-sm transition duration-150
])
id="{{ $tableName }}-filter-{{ $filter->getKey() }}-wrapper"
>
{{ $filter->render($component) }}
{{ $filter->render($component->filterLayout, $tableName, $component->isTailwind(), $component->isBootstrap4(), $component->isBootstrap5()) }}
</div>
@endforeach

@@ -691,7 +691,7 @@ class="{{ $loop->last ? 'mb-0' : 'mb-1' }} form-check-label"
$filter->getFilterSlidedownColspan() == 4,
])
id="{{ $tableName }}-filter-{{ $filter->getKey() }}-wrapper">
{{ $filter->render($component) }}
{{ $filter->render($component->filterLayout, $tableName, $component->isTailwind(), $component->isBootstrap4(), $component->isBootstrap5()) }}
</div>
@endforeach
</div>
2 changes: 1 addition & 1 deletion src/Mechanisms/RappasoftFrontendAssets.php
Original file line number Diff line number Diff line change
@@ -26,7 +26,7 @@ public function register(): void
public function boot()
{
app($this::class)->setRappaScriptRoute(function ($handle) {
$scriptPath = '/livewire/rappasoft-laravel-livewasdfssfbvaire-tables.js';
$scriptPath = '/livewire/rappasoft-laravel-livewire-tables.js';

return Route::get($scriptPath, $handle);
});
2 changes: 1 addition & 1 deletion src/Views/Filter.php
Original file line number Diff line number Diff line change
@@ -65,5 +65,5 @@ public static function make(string $name, string $key = null): Filter

abstract public function isEmpty(string $value): bool;

abstract public function render(DataTableComponent $component);
abstract public function render(string $filterLayout, string $tableName, bool $isTailwind, bool $isBootstrap4, bool $isBootstrap5 );
}
9 changes: 7 additions & 2 deletions src/Views/Filters/DateFilter.php
Original file line number Diff line number Diff line change
@@ -30,10 +30,15 @@ public function getFilterDefaultValue(): ?string
return $this->filterDefaultValue ?? null;
}

public function render(DataTableComponent $component)
public function render(string $filterLayout, string $tableName, bool $isTailwind, bool $isBootstrap4, bool $isBootstrap5)
{
return view('livewire-tables::components.tools.filters.date', [
'component' => $component,
'filterLayout' => $filterLayout,
'tableName' => $tableName,
'isTailwind' => $isTailwind,
'isBootstrap' => ($isBootstrap4 || $isBootstrap5),
'isBootstrap4' => $isBootstrap4,
'isBootstrap5' => $isBootstrap5,
'filter' => $this,
]);
}
9 changes: 7 additions & 2 deletions src/Views/Filters/DateTimeFilter.php
Original file line number Diff line number Diff line change
@@ -30,10 +30,15 @@ public function getFilterDefaultValue(): ?string
return $this->filterDefaultValue ?? null;
}

public function render(DataTableComponent $component)
public function render(string $filterLayout, string $tableName, bool $isTailwind, bool $isBootstrap4, bool $isBootstrap5)
{
return view('livewire-tables::components.tools.filters.datetime', [
'component' => $component,
'filterLayout' => $filterLayout,
'tableName' => $tableName,
'isTailwind' => $isTailwind,
'isBootstrap' => ($isBootstrap4 || $isBootstrap5),
'isBootstrap4' => $isBootstrap4,
'isBootstrap5' => $isBootstrap5,
'filter' => $this,
]);
}
9 changes: 7 additions & 2 deletions src/Views/Filters/MultiSelectDropdownFilter.php
Original file line number Diff line number Diff line change
@@ -108,10 +108,15 @@ public function isEmpty($value): bool
return false;
}

public function render(DataTableComponent $component)
public function render(string $filterLayout, string $tableName, bool $isTailwind, bool $isBootstrap4, bool $isBootstrap5)
{
return view('livewire-tables::components.tools.filters.multi-select-dropdown', [
'component' => $component,
'filterLayout' => $filterLayout,
'tableName' => $tableName,
'isTailwind' => $isTailwind,
'isBootstrap' => ($isBootstrap4 || $isBootstrap5),
'isBootstrap4' => $isBootstrap4,
'isBootstrap5' => $isBootstrap5,
'filter' => $this,
]);
}
9 changes: 7 additions & 2 deletions src/Views/Filters/MultiSelectFilter.php
Original file line number Diff line number Diff line change
@@ -85,10 +85,15 @@ public function isEmpty($value): bool
return ! is_array($value);
}

public function render(DataTableComponent $component)
public function render(string $filterLayout, string $tableName, bool $isTailwind, bool $isBootstrap4, bool $isBootstrap5)
{
return view('livewire-tables::components.tools.filters.multi-select', [
'component' => $component,
'filterLayout' => $filterLayout,
'tableName' => $tableName,
'isTailwind' => $isTailwind,
'isBootstrap' => ($isBootstrap4 || $isBootstrap5),
'isBootstrap4' => $isBootstrap4,
'isBootstrap5' => $isBootstrap5,
'filter' => $this,
]);
}
9 changes: 7 additions & 2 deletions src/Views/Filters/NumberFilter.php
Original file line number Diff line number Diff line change
@@ -25,10 +25,15 @@ public function getFilterDefaultValue(): ?string
return $this->filterDefaultValue ?? null;
}

public function render(DataTableComponent $component)
public function render(string $filterLayout, string $tableName, bool $isTailwind, bool $isBootstrap4, bool $isBootstrap5)
{
return view('livewire-tables::components.tools.filters.number', [
'component' => $component,
'filterLayout' => $filterLayout,
'tableName' => $tableName,
'isTailwind' => $isTailwind,
'isBootstrap' => ($isBootstrap4 || $isBootstrap5),
'isBootstrap4' => $isBootstrap4,
'isBootstrap5' => $isBootstrap5,
'filter' => $this,
]);
}
9 changes: 7 additions & 2 deletions src/Views/Filters/SelectFilter.php
Original file line number Diff line number Diff line change
@@ -62,10 +62,15 @@ public function getFilterDefaultValue(): ?string
return $this->filterDefaultValue ?? null;
}

public function render(DataTableComponent $component)
public function render(string $filterLayout, string $tableName, bool $isTailwind, bool $isBootstrap4, bool $isBootstrap5)
{
return view('livewire-tables::components.tools.filters.select', [
'component' => $component,
'filterLayout' => $filterLayout,
'tableName' => $tableName,
'isTailwind' => $isTailwind,
'isBootstrap' => ($isBootstrap4 || $isBootstrap5),
'isBootstrap4' => $isBootstrap4,
'isBootstrap5' => $isBootstrap5,
'filter' => $this,
]);
}
Loading