From 36156604c4887092d9f9de6ebf8ac1d93dec0484 Mon Sep 17 00:00:00 2001 From: Tyler Alsbury <60230011+tyleralsbury@users.noreply.github.com> Date: Mon, 15 Jul 2024 09:45:20 -0400 Subject: [PATCH] Fixed issues when header is hidden (#3545) * Fixed issues when header is hidden * Fixed predictive search on search page * Made it so that the drawer still shows up --- assets/cart-drawer.js | 4 ++ assets/predictive-search.js | 2 +- layout/theme.liquid | 107 ++++++++++++++++++------------ sections/header.liquid | 16 +---- sections/predictive-search.liquid | 2 +- 5 files changed, 72 insertions(+), 59 deletions(-) diff --git a/assets/cart-drawer.js b/assets/cart-drawer.js index 048e43232d2..ad37f3cb871 100644 --- a/assets/cart-drawer.js +++ b/assets/cart-drawer.js @@ -9,6 +9,8 @@ class CartDrawer extends HTMLElement { setHeaderCartIconAccessibility() { const cartLink = document.querySelector('#cart-icon-bubble'); + if (!cartLink) return; + cartLink.setAttribute('role', 'button'); cartLink.setAttribute('aria-haspopup', 'dialog'); cartLink.addEventListener('click', (event) => { @@ -76,6 +78,8 @@ class CartDrawer extends HTMLElement { const sectionElement = section.selector ? document.querySelector(section.selector) : document.getElementById(section.id); + + if (!sectionElement) return; sectionElement.innerHTML = this.getSectionInnerHTML(parsedState.sections[section.id], section.selector); }); diff --git a/assets/predictive-search.js b/assets/predictive-search.js index ed33c078d81..b30210be21c 100644 --- a/assets/predictive-search.js +++ b/assets/predictive-search.js @@ -240,7 +240,7 @@ class PredictiveSearch extends SearchForm { getResultsMaxHeight() { this.resultsMaxHeight = - window.innerHeight - document.querySelector('.section-header').getBoundingClientRect().bottom; + window.innerHeight - document.querySelector('.section-header')?.getBoundingClientRect().bottom; return this.resultsMaxHeight; } diff --git a/layout/theme.liquid b/layout/theme.liquid index 59d4b3a12fd..ecc3605f659 100644 --- a/layout/theme.liquid +++ b/layout/theme.liquid @@ -1,9 +1,9 @@
- - {% include 'avada-seo' %} - + + {% include 'avada-seo' %} + {% render 'cookiebot' %} {% render 'google-tag-manager-head' %} {% render 'cookiebot-google-consent-mode-script' %} @@ -38,6 +38,10 @@ + + + + {%- if settings.animations_reveal_on_scroll -%} {%- endif -%} @@ -262,6 +266,15 @@ {{ 'custom.css' | asset_url | stylesheet_tag }} {{ 'base.css' | asset_url | stylesheet_tag }} + + + {%- if settings.cart_type == 'drawer' -%} + {{ 'component-cart-drawer.css' | asset_url | stylesheet_tag }} + {{ 'component-cart.css' | asset_url | stylesheet_tag }} + {{ 'component-totals.css' | asset_url | stylesheet_tag }} + {{ 'component-price.css' | asset_url | stylesheet_tag }} + {{ 'component-discounts.css' | asset_url | stylesheet_tag }} + {%- endif -%} {%- unless settings.type_body_font.system? -%} {% comment %}theme-check-disable AssetPreload{% endcomment %} @@ -311,7 +324,7 @@