Skip to content

armgit / spree

Public Imported from GitHub
0

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.

Fix toggle menu (#13377)

Filip Cichorekcdf643e444e6
diff --git a/storefront/app/javascript/spree/storefront/controllers/toggle_menu_controller.js b/storefront/app/javascript/spree/storefront/controllers/toggle_menu_controller.js
index 89bc4c24f6..5a59155584 100644
--- a/storefront/app/javascript/spree/storefront/controllers/toggle_menu_controller.js
+++ b/storefront/app/javascript/spree/storefront/controllers/toggle_menu_controller.js
@@ -7,6 +7,12 @@ export default class ToggleMenu extends Toggle {
connect() {
super.connect()
+ this.setupDynamicHeight()
+ }
+
+ disconnect() {
+ super.disconnect()
+ this.cleanupObservers()
}
hide(e) {
@@ -17,6 +23,7 @@ export default class ToggleMenu extends Toggle {
}
toggle(e) {
+ this.updateDynamicHeight()
super.toggle(e)
if (this.openValue) {
this.buttonTarget.classList.add('menu-open')
@@ -28,4 +35,47 @@ export default class ToggleMenu extends Toggle {
unlockScroll()
}
}
+
+ setupDynamicHeight() {
+ this.updateDynamicHeight()
+ this.setupObservers()
+ }
+
+ updateDynamicHeight() {
+ if (!this.hasContentTarget) return
+
+ const contentTopDistance = this.contentTarget.getBoundingClientRect().top
+ const calculatedHeight = `calc(100dvh - ${contentTopDistance}px)`
+
+ this.contentTarget.style.height = calculatedHeight
+ }
+
+ setupObservers() {
+ const debouncedUpdate = () => {
+ clearTimeout(this.updateTimeout)
+ this.updateTimeout = setTimeout(() => this.updateDynamicHeight(), 16)
+ }
+
+ if (typeof ResizeObserver !== 'undefined') {
+ this.resizeObserver = new ResizeObserver(debouncedUpdate)
+ const navElement = this.element.querySelector('nav[aria-label="Top"]')
+ if (navElement) {
+ this.resizeObserver.observe(navElement)
+ }
+ }
+
+ this.windowResizeHandler = debouncedUpdate
+ window.addEventListener('resize', this.windowResizeHandler)
+ }
+
+ cleanupObservers() {
+ if (this.resizeObserver) {
+ this.resizeObserver.disconnect()
+ }
+ if (this.windowResizeHandler) {
+ window.removeEventListener('resize', this.windowResizeHandler)
+ }
+ clearTimeout(this.updateTimeout)
+ }
+
}
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.erb
index e09318eb23..40b75a63ff 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
@@ -137,19 +137,19 @@
</div>
</nav>
<div
- class='h-0 opacity-0 pointer-events-none hide-on-load'
- data-toggle-menu-target='toggleable'
- role='dialog'
- aria-modal='true'
- >
- <div
- class='flex justify-between flex-col lg:hidden w-full transition-transform 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 - 58px - 36px);'
- >
- <%= render 'spree/page_sections/nav/mobile', section: section %>
- </div>
+ class='h-0 opacity-0 pointer-events-none hide-on-load'
+ data-toggle-menu-target='toggleable'
+ role='dialog'
+ aria-modal='true'
+ >
+ <div
+ class='flex justify-between flex-col lg:hidden w-full transition-transform 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 %>;'
+ >
+ <%= render 'spree/page_sections/nav/mobile', section: section %>
</div>
+ </div>
<%= render 'spree/shared/cart_pane', section: section %>
<% if show_account_pane? %>