@madj2k/fe-frontend-kit 2.0.23 → 2.0.25

package/menus/flyout-menu/flyout-menu-2.0.js

@@ -49,6 +49,7 @@ class Madj2kFlyoutMenu {
       menuCloseClass: "js-flyout-close",
       menuContainerClass: "js-flyout-container",
       menuInnerClass: "js-flyout-inner",
+      heightCalculationClass: 'calculate',
       heightMode: 'full',
       paddingBehavior: 0,
       paddingViewPortMinWidth: 0,
@@ -230,10 +231,13 @@ class Madj2kFlyoutMenu {
    * Opens the flyout menu
    */
   open() {
-    const {$menu, $element, animationOpenStatusClass, openStatusClass} = this.settings;
+    const {$menu, $element, animationOpenStatusClass, openStatusClass, openStatusBodyClass, animationBodyClassPrefix} = this.settings;
+    const $body = document.body;
+
     if (!$menu.classList.contains(openStatusClass) && !$menu.classList.contains(animationOpenStatusClass)) {
       document.dispatchEvent(new CustomEvent('madj2k-slidemenu-close'));
       document.dispatchEvent(new CustomEvent('madj2k-pulldownmenu-close'));
+      document.dispatchEvent(new CustomEvent('madj2k-flyoutmenu-close'));
       document.dispatchEvent(new CustomEvent('madj2k-flyoutmenu-opening'));
 
       this.toggleNoScroll();
@@ -243,7 +247,8 @@ class Madj2kFlyoutMenu {
       $menu.classList.add(openStatusClass, animationOpenStatusClass);
       $element.classList.add(openStatusClass, animationOpenStatusClass);
       $element.setAttribute('aria-expanded', true);
-      document.body.classList.add(`${this.settings.animationBodyClassPrefix}-${animationOpenStatusClass}`);
+      $body.classList.add(openStatusBodyClass);
+      $body.classList.add(`${animationBodyClassPrefix}-${animationOpenStatusClass}`);
 
       this.settings.$menuContainer.style.transition = `top ${this.settings.animationDuration}ms`;
       this.settings.$menuContainer.style.top = '0';
@@ -251,7 +256,7 @@ class Madj2kFlyoutMenu {
       setTimeout(() => {
         $menu.classList.remove(animationOpenStatusClass);
         $element.classList.remove(animationOpenStatusClass);
-        document.body.classList.remove(`${this.settings.animationBodyClassPrefix}-${animationOpenStatusClass}`);
+        $body.classList.remove(`${animationBodyClassPrefix}-${animationOpenStatusClass}`);
         document.dispatchEvent(new CustomEvent('madj2k-flyoutmenu-opened'));
       }, this.settings.animationDuration);
     }
@@ -283,17 +288,20 @@ class Madj2kFlyoutMenu {
    * Closes the flyout menu
    */
   close() {
-    const {$menu, $element, animationCloseStatusClass, openStatusClass} = this.settings;
+    const {$menu, $element, animationCloseStatusClass, openStatusClass, openStatusBodyClass, animationBodyClassPrefix} = this.settings;
+    const $body = document.body;
+
     if ($menu.classList.contains(openStatusClass) && !$menu.classList.contains(animationCloseStatusClass)) {
       document.dispatchEvent(new CustomEvent('madj2k-flyoutmenu-closing'));
 
+      this.toggleNoScroll();
+
       $menu.classList.add(animationCloseStatusClass);
       $element.classList.add(animationCloseStatusClass);
-      document.body.classList.add(`${this.settings.animationBodyClassPrefix}-${animationCloseStatusClass}`);
       $element.classList.remove(openStatusClass);
       $element.setAttribute('aria-expanded', false);
-
-      this.toggleNoScroll();
+      $body.classList.add(`${animationBodyClassPrefix}-${animationCloseStatusClass}`);
+      $body.classList.remove(openStatusBodyClass);
 
       this.settings.$menuContainer.style.transition = `top ${this.settings.animationDuration}ms`;
       this.settings.$menuContainer.style.top = '-100%';
@@ -301,7 +309,7 @@ class Madj2kFlyoutMenu {
       setTimeout(() => {
         $menu.classList.remove(openStatusClass, animationCloseStatusClass);
         $element.classList.remove(animationCloseStatusClass);
-        document.body.classList.remove(`${this.settings.animationBodyClassPrefix}-${animationCloseStatusClass}`);
+        $body.classList.remove(`${animationBodyClassPrefix}-${animationCloseStatusClass}`);
         document.dispatchEvent(new CustomEvent('madj2k-flyoutmenu-closed'));
       }, this.settings.animationDuration);
     }
@@ -333,29 +341,41 @@ class Madj2kFlyoutMenu {
       console.warn('Option "fullHeight" is deprecated. Please use "heightMode" instead.');
     }
 
-    let height = this.settings.$menuInner.offsetHeight || this.settings.$menu.offsetHeight;
+    // remove max-height for correct calculation
+    this.settings.$menu.classList.add(this.settings.heightCalculationClass);
+
+    const innerHeight = this.settings.$menuInner.offsetHeight || this.settings.$menu.offsetHeight;
     const refObj = this.settings.$positionReference || this.$element;
     const refPos = refObj.getBoundingClientRect();
-    const flyoutTop = refPos.top + refObj.offsetHeight;
+    const refHeight = refObj.offsetHeight;
+    const flyoutTop = refPos.top + refHeight;
+    let newHeight = '';
 
     // heightMode "full" with deprecated fullHeight-setting as fallback
     if (this.settings.heightMode === 'full' || this.settings.fullHeight === true) {
+
+      // we use the viewport height because it may be the case that accordions are used here
       const viewPortHeight = window.innerHeight;
-      if (height < viewPortHeight) {
-        this.settings.$menu.style.height = `calc(100vh + ${flyoutTop}px)`;
+      if (innerHeight < (viewPortHeight - flyoutTop)) {
+        newHeight = `calc(100vh - ${flyoutTop}px)`;
       } else {
-        this.settings.$menu.style.height = `${height}px`;
+        newHeight = `${innerHeight}px`;
       }
 
     } else if (this.settings.heightMode === 'maxContent') {
-      this.settings.$menu.style.height = `max-content`;
+      newHeight = `max-content`;
       console.warn('heightMode: maxContent is not working on Apple Safari. Please use heightMode: full instead.');
 
     } else {
-      this.settings.$menu.style.height = `${height}px`;
+      newHeight = `${innerHeight}px`;
     }
+
+    // set max-height again so that longer flyouts do not lead to scrolling on smaller ones
+    this.settings.$menu.classList.remove(this.settings.heightCalculationClass);
+    this.settings.$menu.style.height = newHeight;
   }
 
+
   /**
    * Positions the menu based on the reference element
    */
@@ -405,28 +425,33 @@ class Madj2kFlyoutMenu {
    * Toggles scroll behavior of the page
    */
   toggleNoScroll() {
-    const body = document.body;
-    const helper = body.querySelector('.no-scroll-helper');
-    const inner = body.querySelector('.no-scroll-helper-inner');
-    let noScrollClass = this.settings.openStatusBodyClass;
 
-    if (document.documentElement.scrollHeight > window.innerHeight) {
-      noScrollClass += ' ' + this.settings.openStatusBodyClassOverflow;
-    }
+    // heightMode "full" with deprecated fullHeight-setting as fallback
+    if (this.settings.heightMode === 'full' || this.settings.fullHeight === true) {
+      const body = document.body;
+      const helper = body.querySelector('.no-scroll-helper');
+      const inner = body.querySelector('.no-scroll-helper-inner');
+      let noScrollClass ='';
+
+      if (document.documentElement.scrollHeight > window.innerHeight) {
+        noScrollClass = this.settings.openStatusBodyClassOverflow;
+      }
+
+      if (!body.classList.contains(this.settings.openStatusBodyClass)) {
+        const scrollTop = -document.documentElement.scrollTop;
+        helper.setAttribute('data-scroll-top', scrollTop);
+        helper.style.cssText = 'position:relative;overflow:hidden;height:100vh;width:100%';
+        inner.style.cssText = `position:absolute;top:${scrollTop}px;height:100%;width:100%`;
+        body.classList.add(noScrollClass);
+        window.scrollTo({top: 0, behavior: 'instant'});
+      } else {
+        const scrollTop = parseInt(helper.getAttribute('data-scroll-top') || '0') * -1;
+        helper.removeAttribute('style');
+        inner.removeAttribute('style');
+        body.classList.remove(this.settings.openStatusBodyClassOverflow);
+        window.scrollTo({top: scrollTop, behavior: 'instant'});
+      }
 
-    if (!body.classList.contains(this.settings.openStatusBodyClass)) {
-      const scrollTop = -document.documentElement.scrollTop;
-      helper.setAttribute('data-scroll-top', scrollTop);
-      helper.style.cssText = 'position:relative;overflow:hidden;height:100vh;width:100%';
-      inner.style.cssText = `position:absolute;top:${scrollTop}px;height:100%;width:100%`;
-      body.classList.add(...noScrollClass.split(' '));
-      window.scrollTo({top: 0, behavior: 'instant'});
-    } else {
-      const scrollTop = parseInt(helper.getAttribute('data-scroll-top') || '0') * -1;
-      helper.removeAttribute('style');
-      inner.removeAttribute('style');
-      body.classList.remove(this.settings.openStatusBodyClass, this.settings.openStatusBodyClassOverflow);
-      window.scrollTo({top: scrollTop, behavior: 'instant'});
     }
   }
 }

package/menus/flyout-menu/flyout-menu-2.0.scss

@@ -1,3 +1,7 @@
+html, body {
+    height: 100.1%; // enforce scrollbar
+}
+
 .flyout {
     position: absolute;
     left: 0;
@@ -5,12 +9,18 @@
 
     width: 100%;
     z-index: -1;
-    overflow:hidden;
+    overflow: hidden;
     visibility: hidden;
+    max-height: 0;
+
+    &.calculate {
+        max-height: none;
+    }
 
     &.open {
         z-index: 890;
         visibility: visible;
+        max-height: none;
 
         .flyout-container {
             pointer-events: auto;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@madj2k/fe-frontend-kit",
-  "version": "2.0.23",
+  "version": "2.0.25",
   "description": "Shared frontend utilities, menus and mixins for projects",
 	"main": "index.js",
 	"style": "index.scss",

package/readme.md

@@ -293,13 +293,6 @@ document.querySelector('.js-background-blur').addEventListener('click', function
 ```
 * And we need this additional CSS:
 ```
-/**
- * Prevent jumping because of scrollbar
- */
-html,body {
-    min-height: 100.1%;
-}
-
 /**
  * background-blur for opened flyout
  */

package/sass/bootstrap-5.3/10_mixins/_nav.scss

@@ -268,11 +268,24 @@
 /// @param {Color} $icon-color - Icon color (e.g., fill or text color). Defaults to `$color-primary`.
 /// @param {Map} $icon-mappings - Map of icon toggle states (e.g., hamburger → close). Defaults to a predefined map.
 ///
-/// @example html
+/// @example html with icon font
+///   <button class="nav-toggle" aria-expanded="false">
+///     <i class="nav-toggle-icon icon-hamburger icon"></i>
+///   </button>
+///
+/// @example html with icon sprite
 ///   <button class="nav-toggle" aria-expanded="false">
-///     <i class="nav-toggle-icon icon-hamburger"></i>
+///     <i class="nav-toggle-icon">
+///         <svg class="nav-toggle-icon-opened" aria-hidden="true" focusable="false">
+///             <use href="sprite.svg#search"></use>
+///         </svg>
+///         <svg class="nav-toggle-icon-closed" aria-hidden="true" focusable="false">
+///             <use href="sprite.svg#close"></use>
+///         </svg>
+///     </i>
 ///   </button>
 ///
+///
 /// @example scss
 ///   .nav-toggle {
 ///     @include nav-toggle(
@@ -305,6 +318,7 @@
         display: flex;
         align-items: center;
 
+        // variant with icons as font
         &[aria-expanded="true"] {
             @each $icon-class, $content in $icon-mappings {
                 .#{$icon-class} {
@@ -314,11 +328,30 @@
                 }
             }
         }
+
+        // variant with icons in a sprite
+        .nav-toggle-icon-opened {
+            display: none;
+        }
+
+        &[aria-expanded="true"] {
+            .nav-toggle-icon-opened {
+                display: inline-block;
+            }
+            .nav-toggle-icon-closed {
+                display: none;
+            }
+        }
     }
 
-    &-icon {
+    &-icon:not(:has(svg)),
+    &-icon svg {
         font-size: rem-calc($icon-size);
         width: rem-calc($icon-size);
         color: $icon-color;
     }
+
+    &-icon svg {
+        height: 100%;
+    }
 }