Open Source Platform for DTC, B2B Commerce, Marketplaces & Omnichannel. REST APIs, TypeScript SDKs, and production-ready Next.js storefront. Self-host it. Own your data. No vendor lock-in. Zero platform fees.
Ruby b2b-commercee-commerceecommerceecommerce-apiecommerce-frameworkecommerce-platformheadlessheadless-commerceheadless-ecommercemarketplacemulti-tenantmulti-vendormulti-vendor-ecommerceopen-sourcespree-commerce
Improve the mobile hamburger menu on default storefront (#13129)
Damian Legawiec080b5a9eb3fd
diff --git a/storefront/app/javascript/spree/storefront/controllers/toggle_menu_controller.js b/storefront/app/javascript/spree/storefront/controllers/toggle_menu_controller.jsindex 833ab513f7..89bc4c24f6 100644--- a/storefront/app/javascript/spree/storefront/controllers/toggle_menu_controller.js+++ b/storefront/app/javascript/spree/storefront/controllers/toggle_menu_controller.js@@ -17,7 +17,6 @@ export default class ToggleMenu extends Toggle {}toggle(e) {- this.contentTarget.style.paddingBottom = `${this.contentTarget.offsetTop}px`super.toggle(e)if (this.openValue) {this.buttonTarget.classList.add('menu-open')diff --git a/storefront/app/views/themes/default/spree/page_sections/_header.html.erb b/storefront/app/views/themes/default/spree/page_sections/_header.html.erbindex d412f61fd8..9845e56aff 100644--- a/storefront/app/views/themes/default/spree/page_sections/_header.html.erb+++ b/storefront/app/views/themes/default/spree/page_sections/_header.html.erb@@ -79,9 +79,8 @@<% if should_render_currency_dropdown? || should_render_locale_dropdown? %><divdata-controller="modal"- data-modal-allow-background-close="true"- class="hidden lg:flex"- data-modal-backdrop-color-value="rgba(0,0,0,0.32)">+ data-modal-disable-backdrop="true"+ class="hidden lg:flex"><%= button_tag class: 'flex gap-2 items-center', data: {action: 'modal#open'} do %><% if should_render_currency_dropdown? %><span>@@ -136,7 +135,8 @@</div></div></div>- <div+ </nav>+ <divclass='h-0 opacity-0 pointer-events-none hide-on-load'data-toggle-menu-target='toggleable'role='dialog'@@ -145,12 +145,11 @@<divclass='flex justify-between flex-col lg:hidden w-full transition-transform translate-x-[-50%] has-[.currency-and-locale-modal:not(.hidden)]:transform-none body header--mobile-menu'data-toggle-menu-target='content'- style='background-color: <%= section.preferred_background_color %>; height: calc(100dvh - 38px);'+ style='background-color: <%= section.preferred_background_color %>; height: calc(100dvh - 58px - 36px);'><%= render 'spree/page_sections/nav/mobile', section: section %></div></div>- </nav><%= render 'spree/shared/cart_pane', section: section %><% if show_account_pane? %>diff --git a/storefront/app/views/themes/default/spree/page_sections/nav/_mobile.html.erb b/storefront/app/views/themes/default/spree/page_sections/nav/_mobile.html.erbindex 38b04a1d3d..0beaf93791 100644--- a/storefront/app/views/themes/default/spree/page_sections/nav/_mobile.html.erb+++ b/storefront/app/views/themes/default/spree/page_sections/nav/_mobile.html.erb@@ -1,4 +1,4 @@-<div class="bg-background mt-4 border-default border-t overflow-x-hidden h-full w-screen overflow-y-hidden">+<div class="bg-background border-default border-t overflow-x-hidden h-full w-screen overflow-y-hidden"><div class="h-full flex transform has-[.currency-and-locale-modal:not(.hidden)]:transform-none relative transition-transform duration-300" data-controller="mobile-nav"><div class="w-screen shrink-0 flex flex-col h-full flex-grow-0"><div class="flex-grow overflow-y-scroll">@@ -103,12 +103,7 @@<% if should_render_currency_dropdown? || should_render_locale_dropdown? %><div class="flex mt-4 justify-end">- <div- data-controller="modal"- data-modal-allow-background-close="true"- data-modal-- class=""- data-modal-backdrop-color-value="rgba(0,0,0,0.32)">+ <div data-controller="modal" data-modal-disable-backdrop="true"><%= button_tag class: 'flex gap-2 items-center', data: {action: 'modal#open'} do %><% if should_render_currency_dropdown? %><span>@@ -123,7 +118,7 @@</span><% end %><% end %>- <%= turbo_frame_tag :settings_modal, src: spree.settings_path, loading: :lazy %>+ <%= turbo_frame_tag :settings_modal, src: spree.settings_path, loading: :lazy %></div></div><% end %>diff --git a/storefront/app/views/themes/default/spree/settings/show.html.erb b/storefront/app/views/themes/default/spree/settings/show.html.erbindex 83f20d6999..ce62df10b3 100644--- a/storefront/app/views/themes/default/spree/settings/show.html.erb+++ b/storefront/app/views/themes/default/spree/settings/show.html.erb@@ -2,9 +2,9 @@<divdata-modal-target="container"data-action="click->modal#closeBackground keyup@window->modal#closeWithKeyboard"- class="currency-and-locale-modal hidden animate-fadeIn fixed inset-0 overflow-y-auto flex items-end md:items-center justify-center z-[9999] h-dvh w-full"+ class="currency-and-locale-modal hidden fixed inset-0 overflow-y-auto flex items-end md:items-start justify-center z-[9999] h-dvh w-full"style="animation-duration: 150ms;">- <div class="w-full lg:w-[600px] relative h-auto lg:max-h-screen flex justify-center flex-col gap-4 bg-background p-5 ">+ <div class="w-full lg:w-[600px] relative h-auto lg:max-h-screen flex justify-center flex-col gap-4 bg-background p-5 border border-default mt-12"><buttontype="button"data-action="modal#close"