Merge branch 'develop' of https://github.com/gambitph/Stackable into …

…develop
gambitph · Aug 14, 2023 · 80d89c6 · 80d89c6
2 parents 41c5a5b + c03f1a9
commit 80d89c6
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/src/block/accordion/frontend-accordion.js b/src/block/accordion/frontend-accordion.js
@@ -90,6 +90,20 @@ class StackableAccordion {
 						adjacent = adjacent.previousElementSibling
 					}
 				}
+
+				// If an accordion with large content is closed while opening
+				// another accordion, it scrolls downwards.
+				// This is to instantly scroll to the opening accordion.
+				if ( el.open ) {
+					const isAboveView = el.getBoundingClientRect().top < 0
+					if ( isAboveView ) {
+						el.scrollIntoView( {
+							inline: 'start',
+							block: 'start',
+							behavior: 'instant',
+						} )
+					}
+				}
 			} )
 		} )
 

diff --git a/src/block/carousel/frontend-carousel.js b/src/block/carousel/frontend-carousel.js
@@ -89,11 +89,11 @@ class _StackableCarousel {
 		}
 
 		// Mousewheel left and right should scroll the fade carousel
-		this.sliderEl.addEventListener( 'wheel', this.onWheel )
+		this.sliderEl.addEventListener( 'wheel', this.onWheel, { passive: true } )
 
 		// Dragging
 		this.sliderEl.addEventListener( 'mousedown', this.dragMouseDown )
-		this.sliderEl.addEventListener( 'touchstart', this.dragTouchStart )
+		this.sliderEl.addEventListener( 'touchstart', this.dragTouchStart, { passive: true } )
 		this.sliderEl.addEventListener( 'scroll', this.onScroll )
 
 		// Autoplay