quasar 2.21.0 → 2.21.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "quasar",
-  "version": "2.21.0",
+  "version": "2.21.1",
   "description": "Build high-performance VueJS user interfaces (SPA, PWA, SSR, Mobile and Desktop) in record time",
   "keywords": [
     "desktop",
@@ -69,7 +69,7 @@
     "open": "^11.0.0",
     "postcss": "^8.5.16",
     "postcss-rtlcss": "^6.0.0",
-    "rolldown": "^1.1.3",
+    "rolldown": "^1.1.4",
     "sass-embedded": "^1.100.0",
     "table": "^6.8.2",
     "tinyglobby": "^0.2.17",

package/src/css/core/helpers.sass

@@ -16,8 +16,13 @@
   color: inherit
   opacity: .7
 
+.q-document--prevent-scroll
+  overscroll-behavior: none !important
+  body
+    position: fixed !important
+
 /* body */
-.q-body--fullscreen-mixin, .q-body--prevent-scroll
+.q-body--fullscreen-mixin
   position: fixed !important
 
 .q-body--force-scrollbar-x

package/src/utils/scroll/prevent-scroll.js

@@ -1,9 +1,8 @@
 import {
   getHorizontalScrollPosition,
-  getVerticalScrollPosition,
-  hasScrollbar
+  getVerticalScrollPosition
 } from './scroll.js'
-import { getEventPath, listenOpts, stopAndPrevent } from '../event/event.js'
+import { listenOpts } from '../event/event.js'
 import { client } from '../../plugins/platform/Platform.js'
 
 let registered = 0,
@@ -16,42 +15,6 @@ let registered = 0,
   href,
   closeTimer = null
 
-function onWheel(e) {
-  if (shouldPreventScroll(e)) {
-    stopAndPrevent(e)
-  }
-}
-
-function shouldPreventScroll(e) {
-  if (
-    e.target === document.body ||
-    e.target.classList.contains('q-layout__backdrop')
-  ) {
-    return true
-  }
-
-  const path = getEventPath(e),
-    shift = e.shiftKey && !e.deltaX,
-    scrollY = !shift && Math.abs(e.deltaX) <= Math.abs(e.deltaY),
-    delta = shift || scrollY ? e.deltaY : e.deltaX
-
-  for (let index = 0; index < path.length; index++) {
-    const el = path[index]
-
-    if (hasScrollbar(el, scrollY)) {
-      return scrollY
-        ? delta < 0 && el.scrollTop === 0
-          ? true
-          : delta > 0 && el.scrollTop + el.clientHeight === el.scrollHeight
-        : delta < 0 && el.scrollLeft === 0
-          ? true
-          : delta > 0 && el.scrollLeft + el.clientWidth === el.scrollWidth
-    }
-  }
-
-  return true
-}
-
 function onAppleScroll(e) {
   if (e.target === document) {
     // required, otherwise iOS blocks further scrolling
@@ -114,7 +77,7 @@ function apply(action) {
       body.classList.add('q-body--force-scrollbar-y')
     }
 
-    body.classList.add('q-body--prevent-scroll')
+    document.documentElement.classList.add('q-document--prevent-scroll')
     document.qScrollPrevented = true
 
     if (client.is.ios) {
@@ -139,14 +102,9 @@ function apply(action) {
         )
       }
     }
-  }
-
-  if (client.is.desktop && client.is.mac) {
-    // ref. https://developers.google.com/web/updates/2017/01/scrolling-intervention
-    window[`${action}EventListener`]('wheel', onWheel, listenOpts.notPassive)
-  }
+  } else {
+    // action === 'remove'
 
-  if (action === 'remove') {
     if (client.is.ios) {
       if (hasViewport) {
         window.visualViewport.removeEventListener(
@@ -168,8 +126,8 @@ function apply(action) {
       }
     }
 
+    document.documentElement.classList.remove('q-document--prevent-scroll')
     body.classList.remove(
-      'q-body--prevent-scroll',
       'q-body--force-scrollbar-x',
       'q-body--force-scrollbar-y'
     )