Quick run through of applying new test entity helper class

[bookstack] / resources / js / components / dropdown.js

diff --git a/resources/js/components/dropdown.js b/resources/js/components/dropdown.js
index 22402d483902b2148918150e1d371611dd1abf9b..781f90860f7aa539595d56723a95d8347c1c4060 100644 (file)
--- a/resources/js/components/dropdown.js
+++ b/resources/js/components/dropdown.js
@@ -12,6 +12,7 @@ class DropDown {
         this.menu = this.$refs.menu;
         this.toggle = this.$refs.toggle;
         this.moveMenu = this.$opts.moveMenu;
         this.menu = this.$refs.menu;
         this.toggle = this.$refs.toggle;
         this.moveMenu = this.$opts.moveMenu;

+        this.bubbleEscapes = this.$opts.bubbleEscapes === 'true';

 
         this.direction = (document.dir === 'rtl') ? 'right' : 'left';
         this.body = document.body;
 
         this.direction = (document.dir === 'rtl') ? 'right' : 'left';
         this.body = document.body;


@@ -27,18 +28,27 @@ class DropDown {
         this.menu.classList.add('anim', 'menuIn');
         this.toggle.setAttribute('aria-expanded', 'true');
 
         this.menu.classList.add('anim', 'menuIn');
         this.toggle.setAttribute('aria-expanded', 'true');
 

+        const menuOriginalRect = this.menu.getBoundingClientRect();
+        let heightOffset = 0;
+        const toggleHeight = this.toggle.getBoundingClientRect().height;
+        const dropUpwards = menuOriginalRect.bottom > window.innerHeight;
+
+        // If enabled, Move to body to prevent being trapped within scrollable sections

         if (this.moveMenu) {
         if (this.moveMenu) {

-            // Move to body to prevent being trapped within scrollable sections
-            this.rect = this.menu.getBoundingClientRect();

             this.body.appendChild(this.menu);
             this.menu.style.position = 'fixed';
             this.body.appendChild(this.menu);
             this.menu.style.position = 'fixed';

-            if (this.direction === 'right') {
-                this.menu.style.right = `${(this.rect.right - this.rect.width)}px`;
-            } else {
-                this.menu.style.left = `${this.rect.left}px`;
-            }
-            this.menu.style.top = `${this.rect.top}px`;
-            this.menu.style.width = `${this.rect.width}px`;
+            this.menu.style.width = `${menuOriginalRect.width}px`;
+            this.menu.style.left = `${menuOriginalRect.left}px`;
+            heightOffset = dropUpwards ? (window.innerHeight - menuOriginalRect.top  - toggleHeight / 2) : menuOriginalRect.top;
+        }
+
+        // Adjust menu to display upwards if near the bottom of the screen
+        if (dropUpwards) {
+            this.menu.style.top = 'initial';
+            this.menu.style.bottom = `${heightOffset}px`;
+        } else {
+            this.menu.style.top = `${heightOffset}px`;
+            this.menu.style.bottom = 'initial';

         }
 
         // Set listener to hide on mouse leave or window click
         }
 
         // Set listener to hide on mouse leave or window click


@@ -73,18 +83,22 @@ class DropDown {
         this.menu.style.display = 'none';
         this.menu.classList.remove('anim', 'menuIn');
         this.toggle.setAttribute('aria-expanded', 'false');
         this.menu.style.display = 'none';
         this.menu.classList.remove('anim', 'menuIn');
         this.toggle.setAttribute('aria-expanded', 'false');

+        this.menu.style.top = '';
+        this.menu.style.bottom = '';
+

         if (this.moveMenu) {
             this.menu.style.position = '';
             this.menu.style[this.direction] = '';
         if (this.moveMenu) {
             this.menu.style.position = '';
             this.menu.style[this.direction] = '';

-            this.menu.style.top = '';

             this.menu.style.width = '';
             this.menu.style.width = '';

+            this.menu.style.left = '';

             this.container.appendChild(this.menu);
         }
             this.container.appendChild(this.menu);
         }

+

         this.showing = false;
     }
 
     getFocusable() {
         this.showing = false;
     }
 
     getFocusable() {

-        return Array.from(this.menu.querySelectorAll('[tabindex],[href],button,input:not([type=hidden])'));
+        return Array.from(this.menu.querySelectorAll('[tabindex]:not([tabindex="-1"]),[href],button,input:not([type=hidden])'));

     }
 
     focusNext() {
     }
 
     focusNext() {


@@ -137,7 +151,9 @@ class DropDown {
             } else if (event.key === 'Escape') {
                 this.hide();
                 this.toggle.focus();
             } else if (event.key === 'Escape') {
                 this.hide();
                 this.toggle.focus();

-                event.stopPropagation();
+                if (!this.bubbleEscapes) {
+                    event.stopPropagation();
+                }

             }
         };
         this.container.addEventListener('keydown', keyboardNavigation);
             }
         };
         this.container.addEventListener('keydown', keyboardNavigation);