Skip to content

v3.7.4 #2282

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.

Sign up for GitHub

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

Open
wants to merge 8 commits into
base: master
Choose a base branch
from
Open

v3.7.4 #2282

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
8b06924
Update TableAttributeHelpers.php
pascalberski May 13, 2025
98f5f24
Update filter-pills.blade.php
pascalberski May 13, 2025
647943c
Change w-100 to w-auto for Bootstrap Bulk Actions Menu
lrljoe May 25, 2025
45e1a57
Replace w-100 with w-auto on column-select
lrljoe May 25, 2025
356c2c6
Key the x-cloak for TableAttributes
lrljoe May 25, 2025
0f9f255
Merge pull request #2271 from lrljoe/AdjustAttributeDefaultForXCloak
lrljoe Jun 4, 2025
4a9c4ed
Merge pull request #2270 from lrljoe/BootstrapMenuFix
lrljoe Jun 4, 2025
0201904
Merge pull request #2266 from pascalberski/development
lrljoe Jun 4, 2025
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
4 changes: 2 additions & 2 deletions resources/views/components/tools/filter-pills.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<div {{ $attributes->merge([

'wire:loading.class' => $this->displayFilterPillsWhileLoading ? '' : 'invisible',
'x-cloak',
'x-cloak' => '',
])
->class([
'mb-4 px-4 md:p-0' => $isTailwind,
Expand All @@ -27,4 +27,4 @@
@endtableloop

<x-livewire-tables::tools.filter-pills.buttons.reset-all />
</div>
</div>
4 changes: 2 additions & 2 deletions resources/views/components/tools/toolbar/items/bulk-actions.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,8 +94,8 @@ class="origin-top-right absolute right-0 mt-2 w-full md:w-48 rounded-md shadow-l
{{
$attributes->merge($this->getBulkActionsMenuAttributes)
->class([
'dropdown-menu dropdown-menu-right w-100' => $isBootstrap4 && ($this->getBulkActionsMenuAttributes['default-styling'] ?? true),
'dropdown-menu dropdown-menu-end w-100' => $isBootstrap5 && ($this->getBulkActionsMenuAttributes['default-styling'] ?? true),
'dropdown-menu dropdown-menu-right w-auto' => $isBootstrap4 && ($this->getBulkActionsMenuAttributes['default-styling'] ?? true),
'dropdown-menu dropdown-menu-end w-auto' => $isBootstrap5 && ($this->getBulkActionsMenuAttributes['default-styling'] ?? true),
])
->except(['default','default-styling','default-colors'])
}}
Expand Down
6 changes: 3 additions & 3 deletions resources/views/components/tools/toolbar/items/column-select.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ class="inline-flex items-center px-2 py-1 disabled:opacity-50 disabled:cursor-wa
{{
$attributes->merge($this->getColumnSelectButtonAttributes())
->class([
'btn dropdown-toggle d-block w-100 d-md-inline' => $this->getColumnSelectButtonAttributes()['default-styling'],
'btn dropdown-toggle d-block w-auto d-md-inline' => $this->getColumnSelectButtonAttributes()['default-styling'],
])
->except(['default-styling', 'default-colors'])
}}
Expand All @@ -135,8 +135,8 @@ class="inline-flex items-center px-2 py-1 disabled:opacity-50 disabled:cursor-wa
<div
x-bind:class="{ 'show': open }"
@class([
'dropdown-menu dropdown-menu-right w-100 mt-0 mt-md-3' => $isBootstrap4,
'dropdown-menu dropdown-menu-end w-100' => $isBootstrap5,
'dropdown-menu dropdown-menu-right w-auto mt-0 mt-md-3' => $isBootstrap4,
'dropdown-menu dropdown-menu-end w-auto' => $isBootstrap5,
])
aria-labelledby="columnSelect-{{ $tableName }}"
>
Expand Down
2 changes: 1 addition & 1 deletion src/Traits/Helpers/TableAttributeHelpers.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ public function getTopLevelAttributesArray(): array
return [
'x-data' => 'laravellivewiretable($wire)',
'x-init' => "setTableId('".$this->getTableAttributes()['id']."'); setAlpineBulkActions('".$this->showBulkActionsDropdownAlpine()."'); setPrimaryKeyName('".$this->getPrimaryKey()."');",
'x-cloak',
'x-cloak' => '',
'x-show' => 'shouldBeDisplayed',
'x-on:show-table.window' => 'showTable(event)',
'x-on:hide-table.window' => 'hideTable(event)',
Expand Down
Loading