quasar 2.4.6 → 2.4.7

package/dist/ssr-directives/Morph.js

@@ -1,5 +1,5 @@
 /*!
- * Quasar Framework v2.4.6
+ * Quasar Framework v2.4.7
  * (c) 2015-present Razvan Stoenescu
  * Released under the MIT License.
  */

package/dist/web-types/web-types.json

@@ -2,7 +2,7 @@
   "$schema": "",
   "framework": "vue",
   "name": "quasar",
-  "version": "2.4.6",
+  "version": "2.4.7",
   "contributions": {
     "html": {
       "types-syntax": "typescript",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "quasar",
-  "version": "2.4.6",
+  "version": "2.4.7",
   "description": "Build high-performance VueJS user interfaces (SPA, PWA, SSR, Mobile and Desktop) in record time",
   "main": "dist/quasar.cjs.prod.js",
   "module": "dist/quasar.esm.prod.js",

package/src/components/layout/QLayout.js

@@ -175,7 +175,7 @@ export default createComponent({
 
     // prevent scrollbar flicker while resizing window height
     // if no page scrollbar is already present
-    if (__QUASAR_SSR__ !== true) {
+    if (__QUASAR_SSR_SERVER__ !== true && getScrollbarWidth() > 0) {
       let timer = null
       const el = document.body
 
@@ -188,7 +188,7 @@ export default createComponent({
         if (timer === null) {
           // if it has no scrollbar then there's nothing to do
 
-          if (el.scrollHeight > window.innerHeight) {
+          if (el.scrollHeight > $q.screen.height) {
             return
           }
 
@@ -211,11 +211,12 @@ export default createComponent({
       }
 
       watch(
-        () => (props.container !== true && scrollbarWidth.value > 0 ? 'add' : 'remove'),
-        updateScrollEvent,
-        { immediate: true }
+        () => (props.container !== true ? 'add' : 'remove'),
+        updateScrollEvent
       )
 
+      props.container !== true && updateScrollEvent('add')
+
       onUnmounted(() => {
         updateScrollEvent('remove')
       })