Skip to content

Commit 7ce4512

Browse files
committed
Fix dropdowns on bootstrap
1 parent e3b6f29 commit 7ce4512

File tree

3 files changed

+46
-7
lines changed

3 files changed

+46
-7
lines changed

resources/views/bootstrap-4/includes/column-select.blade.php

Lines changed: 20 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,27 @@
11
@if ($columnSelect)
2-
<div class="dropdown mb-3 mb-md-0 pl-0 pl-md-3 d-block d-md-inline">
3-
<button class="btn dropdown-toggle d-block w-100 d-md-inline" type="button" id="columnSelect" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
2+
<div
3+
x-cloak
4+
x-data="{ open: false }"
5+
@keydown.escape.stop="open = false"
6+
@mousedown.away="open = false"
7+
class="dropdown mb-3 mb-md-0 pl-0 pl-md-3 d-block d-md-inline"
8+
>
9+
<button
10+
@click="open = !open"
11+
class="btn dropdown-toggle d-block w-100 d-md-inline"
12+
type="button"
13+
id="columnSelect"
14+
aria-haspopup="true"
15+
aria-expanded="false"
16+
>
417
@lang('Columns')
518
</button>
619

7-
<div class="dropdown-menu dropdown-menu-right w-100" aria-labelledby="columnSelect">
20+
<div
21+
class="dropdown-menu dropdown-menu-right w-100"
22+
:class="{'show' : open}"
23+
aria-labelledby="columnSelect"
24+
>
825
@foreach($columns as $column)
926
@if ($column->isVisible() && $column->isSelectable())
1027
<div wire:key="columnSelect-{{ $loop->index }}">

resources/views/bootstrap-5/includes/column-select.blade.php

Lines changed: 20 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,27 @@
11
@if ($columnSelect)
2-
<div class="dropdown mb-3 mb-md-0 md-0 ms-md-3 d-block d-md-inline">
3-
<button class="btn dropdown-toggle d-block w-100 d-md-inline" type="button" id="columnSelect" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
2+
<div
3+
x-cloak
4+
x-data="{ open: false }"
5+
@keydown.escape.stop="open = false"
6+
@mousedown.away="open = false"
7+
class="dropdown mb-3 mb-md-0 md-0 ms-md-3 d-block d-md-inline"
8+
>
9+
<button
10+
@click="open = !open"
11+
class="btn dropdown-toggle d-block w-100 d-md-inline"
12+
type="button"
13+
id="columnSelect"
14+
aria-haspopup="true"
15+
aria-expanded="false"
16+
>
417
@lang('Columns')
518
</button>
619

7-
<div class="dropdown-menu dropdown-menu-end w-100" aria-labelledby="columnSelect">
20+
<div
21+
class="dropdown-menu dropdown-menu-end w-100"
22+
:class="{'show' : open}"
23+
aria-labelledby="columnSelect"
24+
>
825
@foreach($columns as $column)
926
@if ($column->isVisible() && $column->isSelectable())
1027
<div wire:key="columnSelect-{{ $loop->index }}">

resources/views/tailwind/includes/column-select.blade.php

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,13 @@ class="origin-top-right absolute right-0 mt-2 w-48 rounded-md shadow-lg z-50"
4242
@foreach($columns as $column)
4343
@if ($column->isVisible() && $column->isSelectable())
4444
<div wire:key="columnSelect-{{ $loop->index }}">
45-
<label class="px-2 py-1 inline-flex items-center">
45+
<label
46+
wire:loading.attr="disabled"
47+
wire:target="columnSelectEnabled"
48+
class="px-2 py-1 inline-flex items-center disabled:opacity-50 disabled:cursor-wait"
49+
>
4650
<input
51+
class="disabled:opacity-50 disabled:cursor-wait"
4752
wire:model="columnSelectEnabled"
4853
wire:target="columnSelectEnabled"
4954
wire:loading.attr="disabled"

0 commit comments

Comments
 (0)