Skip to content

Commit 7d3cd6e

Browse files
danharrindanharrin
committed
Merge branch '4.x' into 5.x
2 parents 986319d + 948caa8 commit 7d3cd6e

File tree

3 files changed

+55
-44
lines changed

3 files changed

+55
-44
lines changed

‎packages/panels/dist/theme.css‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎packages/panels/resources/css/components/topbar.css‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,10 @@
3434
}
3535
}
3636

37+
.fi-topbar-collapse-sidebar-btn-ctn {
38+
@apply w-9 shrink-0;
39+
}
40+
3741
.fi-body {
3842
&.fi-body-has-sidebar-collapsible-on-desktop,
3943
&:not(.fi-body-has-sidebar-fully-collapsible-on-desktop) {

‎packages/panels/resources/views/livewire/topbar.blade.php‎

Lines changed: 50 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -40,50 +40,57 @@ class="fi-topbar-close-sidebar-btn"
4040
@endif
4141

4242
<div class="fi-topbar-start">
43-
@if ($isSidebarCollapsibleOnDesktop)
44-
<x-filament::icon-button
45-
color="gray"
46-
:icon="$isRtl ? \Filament\Support\Icons\Heroicon::OutlinedChevronLeft : \Filament\Support\Icons\Heroicon::OutlinedChevronRight"
47-
{{-- @deprecated Use `PanelsIconAlias::SIDEBAR_EXPAND_BUTTON_RTL` instead of `PanelsIconAlias::SIDEBAR_EXPAND_BUTTON` for RTL. --}}
48-
:icon-alias="
49-
$isRtl
50-
? [
51-
\Filament\View\PanelsIconAlias::SIDEBAR_EXPAND_BUTTON_RTL,
52-
\Filament\View\PanelsIconAlias::SIDEBAR_EXPAND_BUTTON,
53-
]
54-
: \Filament\View\PanelsIconAlias::SIDEBAR_EXPAND_BUTTON
55-
"
56-
icon-size="lg"
57-
:label="__('filament-panels::layout.actions.sidebar.expand.label')"
58-
x-cloak
59-
x-data="{}"
60-
x-on:click="$store.sidebar.open()"
61-
x-show="! $store.sidebar.isOpen"
62-
class="fi-topbar-open-collapse-sidebar-btn"
63-
/>
64-
@endif
65-
6643
@if ($isSidebarCollapsibleOnDesktop || $isSidebarFullyCollapsibleOnDesktop)
67-
<x-filament::icon-button
68-
color="gray"
69-
:icon="$isRtl ? \Filament\Support\Icons\Heroicon::OutlinedChevronRight : \Filament\Support\Icons\Heroicon::OutlinedChevronLeft"
70-
{{-- @deprecated Use `PanelsIconAlias::SIDEBAR_COLLAPSE_BUTTON_RTL` instead of `PanelsIconAlias::SIDEBAR_COLLAPSE_BUTTON` for RTL. --}}
71-
:icon-alias="
72-
$isRtl
73-
? [
74-
\Filament\View\PanelsIconAlias::SIDEBAR_COLLAPSE_BUTTON_RTL,
75-
\Filament\View\PanelsIconAlias::SIDEBAR_COLLAPSE_BUTTON,
76-
]
77-
: \Filament\View\PanelsIconAlias::SIDEBAR_COLLAPSE_BUTTON
78-
"
79-
icon-size="lg"
80-
:label="__('filament-panels::layout.actions.sidebar.collapse.label')"
81-
x-cloak
82-
x-data="{}"
83-
x-on:click="$store.sidebar.close()"
84-
x-show="$store.sidebar.isOpen"
85-
class="fi-topbar-close-collapse-sidebar-btn"
86-
/>
44+
<div
45+
x-show="$store.sidebar.isOpen || @js($isSidebarCollapsibleOnDesktop)"
46+
class="fi-topbar-collapse-sidebar-btn-ctn"
47+
>
48+
@if ($isSidebarCollapsibleOnDesktop)
49+
<x-filament::icon-button
50+
color="gray"
51+
:icon="$isRtl ? \Filament\Support\Icons\Heroicon::OutlinedChevronLeft : \Filament\Support\Icons\Heroicon::OutlinedChevronRight"
52+
{{-- @deprecated Use `PanelsIconAlias::SIDEBAR_EXPAND_BUTTON_RTL` instead of `PanelsIconAlias::SIDEBAR_EXPAND_BUTTON` for RTL. --}}
53+
:icon-alias="
54+
$isRtl
55+
? [
56+
\Filament\View\PanelsIconAlias::SIDEBAR_EXPAND_BUTTON_RTL,
57+
\Filament\View\PanelsIconAlias::SIDEBAR_EXPAND_BUTTON,
58+
]
59+
: \Filament\View\PanelsIconAlias::SIDEBAR_EXPAND_BUTTON
60+
"
61+
icon-size="lg"
62+
:label="__('filament-panels::layout.actions.sidebar.expand.label')"
63+
x-cloak
64+
x-data="{}"
65+
x-on:click="$store.sidebar.open()"
66+
x-show="! $store.sidebar.isOpen"
67+
class="fi-topbar-open-collapse-sidebar-btn"
68+
/>
69+
@endif
70+
71+
@if ($isSidebarCollapsibleOnDesktop || $isSidebarFullyCollapsibleOnDesktop)
72+
<x-filament::icon-button
73+
color="gray"
74+
:icon="$isRtl ? \Filament\Support\Icons\Heroicon::OutlinedChevronRight : \Filament\Support\Icons\Heroicon::OutlinedChevronLeft"
75+
{{-- @deprecated Use `PanelsIconAlias::SIDEBAR_COLLAPSE_BUTTON_RTL` instead of `PanelsIconAlias::SIDEBAR_COLLAPSE_BUTTON` for RTL. --}}
76+
:icon-alias="
77+
$isRtl
78+
? [
79+
\Filament\View\PanelsIconAlias::SIDEBAR_COLLAPSE_BUTTON_RTL,
80+
\Filament\View\PanelsIconAlias::SIDEBAR_COLLAPSE_BUTTON,
81+
]
82+
: \Filament\View\PanelsIconAlias::SIDEBAR_COLLAPSE_BUTTON
83+
"
84+
icon-size="lg"
85+
:label="__('filament-panels::layout.actions.sidebar.collapse.label')"
86+
x-cloak
87+
x-data="{}"
88+
x-on:click="$store.sidebar.close()"
89+
x-show="$store.sidebar.isOpen"
90+
class="fi-topbar-close-collapse-sidebar-btn"
91+
/>
92+
@endif
93+
</div>
8794
@endif
8895

8996
{{ \Filament\Support\Facades\FilamentView::renderHook(\Filament\View\PanelsRenderHook::TOPBAR_LOGO_BEFORE) }}

0 commit comments

Comments
 (0)