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

Fix: Side menu always displays #3064

Merged
merged 9 commits into from
Jul 29, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion app/components/avo/sidebar_component.html.erb
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<div
class="avo-sidebar fixed z-[60] t-0 application-sidebar w-64 flex-1 border-r lg:border-none bg-none h-[calc(100vh-4rem)] bg-application lg:bg-transparent <%= 'print:hidden' if Avo.configuration.hide_layout_when_printing %>"
class="avo-sidebar fixed z-[60] t-0 application-sidebar w-64 flex-1 border-r lg:border-none bg-none h-[calc(100vh-4rem)] bg-application lg:bg-transparent <%= 'print:hidden' if Avo.configuration.hide_layout_when_printing %> <%= 'hidden' unless @sidebar_open %>"
data-sidebar-target="<%= stimulus_target %>"
>
<div class="flex flex-col w-full h-full">
Expand Down
13 changes: 9 additions & 4 deletions app/controllers/avo/application_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ def exception_logger(exception)
format.html { raise exception }
format.json {
render json: {
errors: exception.respond_to?(:record) && exception.record.present? ? exception.record.errors : [],
errors: (exception.respond_to?(:record) && exception.record.present?) ? exception.record.errors : [],
message: exception.message,
traces: exception.backtrace
}, status: ActionDispatch::ExceptionWrapper.status_code_for_exception(exception.class.name)
Expand All @@ -62,7 +62,7 @@ def resource_name

begin
request.path
.match(/\/?#{Avo.root_path.delete('/')}\/resources\/([a-z1-9\-_]*)\/?/mi)
.match(/\/?#{Avo.root_path.delete("/")}\/resources\/([a-z1-9\-_]*)\/?/mi)
.captures
.first
rescue
Expand Down Expand Up @@ -292,8 +292,13 @@ def set_force_locale(&action)
end

def set_sidebar_open
value = cookies["#{Avo::COOKIES_KEY}.sidebar.open"]
@sidebar_open = value.blank? || value == "1"
value = if cookies["#{Avo::COOKIES_KEY}.sidebar.open"].nil?
cookies["#{Avo::COOKIES_KEY}.sidebar.open"] = "1"
else
cookies["#{Avo::COOKIES_KEY}.sidebar.open"]
end

@sidebar_open = value == "1"
end

# Set the current host for ActiveStorage
Expand Down
20 changes: 19 additions & 1 deletion app/javascript/js/controllers/sidebar_controller.js
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,25 @@ export default class extends Controller {
}

toggleSidebar() {
if (this.sidebarTarget.classList.contains('hidden')) {
this.sidebarTarget.classList.remove('hidden')
}
this.mainAreaTarget.classList.toggle('sidebar-open')
const value = Cookies.get(this.cookieKey)
Cookies.set(this.cookieKey, value === '1' ? '0' : '1')
}

toggleSidebarOnMobile() {
if (this.mobileSidebarTarget.classList.contains('hidden')) {
this.mainAreaTarget.classList.remove('sidebar-open')
this.mobileSidebarTarget.classList.remove('hidden')

// we force a reflow here because we remove then
// immediately add the sidebar-open class
// which doesn't give the browser enough time to apply the
// transistion.
this.mainAreaTarget.offsetHeight;
}
this.mainAreaTarget.classList.toggle('sidebar-open')
Cookies.set(this.cookieKey, this.cookieKey === '1' ? '0' : '1')
}
}
3 changes: 2 additions & 1 deletion app/views/avo/partials/_navbar.html.erb
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
<%= content_tag :div, class: class_names("fixed bg-white p-2 w-full flex flex-shrink-0 items-center z-[100] px-4 lg:px-4 border-b space-x-4 lg:space-x-0 h-16", {"print:hidden": Avo.configuration.hide_layout_when_printing}) do %>
<div class="flex items-center space-x-2 w-auto lg:w-64 flex-shrink-0 h-full">
<div>
<%= a_button icon: 'avo/menu', size: :xs, compact: true, style: :text, data: { action: 'click->sidebar#toggleSidebar' }, aria: {label: "Toggle sidebar"} %>
<%= a_button class: 'lg:hidden', icon: 'avo/menu', size: :xs, compact: true, style: :text, data: { action: 'click->sidebar#toggleSidebarOnMobile' }, aria: {label: "Toggle sidebar"} %>
<%= a_button class: 'hidden lg:block', icon: 'avo/menu', size: :xs, compact: true, style: :text, data: { action: 'click->sidebar#toggleSidebar' }, aria: {label: "Toggle sidebar"} %>
</div>
<%= render partial: "avo/partials/logo" %>
</div>
Expand Down
Loading