quasar 2.19.3 → 2.20.1

package/src/components/scroll-area/QScrollArea.js

@@ -1,12 +1,12 @@
 import {
-  h,
-  ref,
   computed,
-  watch,
+  getCurrentInstance,
+  h,
   onActivated,
-  onDeactivated,
   onBeforeUnmount,
-  getCurrentInstance
+  onDeactivated,
+  ref,
+  watch
 } from 'vue'
 
 import useDark, {
@@ -22,8 +22,8 @@ import TouchPan from '../../directives/touch-pan/TouchPan.js'
 import { createComponent } from '../../utils/private.create/create.js'
 import { between } from '../../utils/format/format.js'
 import {
-  setVerticalScrollPosition,
-  setHorizontalScrollPosition
+  setHorizontalScrollPosition,
+  setVerticalScrollPosition
 } from '../../utils/scroll/scroll.js'
 import { hMergeSlot } from '../../utils/private.render/render.js'
 import debounce from '../../utils/debounce/debounce.js'
@@ -123,8 +123,7 @@ export default createComponent({
     const targetRef = ref(null)
 
     const classes = computed(
-      () =>
-        'q-scrollarea' + (isDark.value === true ? ' q-scrollarea--dark' : '')
+      () => 'q-scrollarea' + (isDark.value ? ' q-scrollarea--dark' : '')
     )
 
     Object.assign(container, {
@@ -149,13 +148,13 @@ export default createComponent({
         return 0
       }
       const p = between(scroll.vertical.position.value / diff, 0, 1)
-      return Math.round(p * 10000) / 10000
+      return Math.round(p * 10_000) / 10_000
     })
     scroll.vertical.thumbHidden = computed(
       () =>
-        ((props.visible === null ? hover.value : props.visible) !== true &&
-          tempShowing.value === false &&
-          panning.value === false) ||
+        (!(props.visible === null ? hover.value : props.visible) &&
+          !tempShowing.value &&
+          !panning.value) ||
         scroll.vertical.size.value <= container.vertical.value + 1
     )
     scroll.vertical.thumbStart = computed(
@@ -184,14 +183,14 @@ export default createComponent({
     scroll.vertical.thumbClass = computed(
       () =>
         'q-scrollarea__thumb q-scrollarea__thumb--v absolute-right' +
-        (scroll.vertical.thumbHidden.value === true
+        (scroll.vertical.thumbHidden.value
           ? ' q-scrollarea__thumb--invisible'
           : '')
     )
     scroll.vertical.barClass = computed(
       () =>
         'q-scrollarea__bar q-scrollarea__bar--v absolute-right' +
-        (scroll.vertical.thumbHidden.value === true
+        (scroll.vertical.thumbHidden.value
           ? ' q-scrollarea__bar--invisible'
           : '')
     )
@@ -202,13 +201,13 @@ export default createComponent({
         return 0
       }
       const p = between(Math.abs(scroll.horizontal.position.value) / diff, 0, 1)
-      return Math.round(p * 10000) / 10000
+      return Math.round(p * 10_000) / 10_000
     })
     scroll.horizontal.thumbHidden = computed(
       () =>
-        ((props.visible === null ? hover.value : props.visible) !== true &&
-          tempShowing.value === false &&
-          panning.value === false) ||
+        (!(props.visible === null ? hover.value : props.visible) &&
+          !tempShowing.value &&
+          !panning.value) ||
         scroll.horizontal.size.value <= container.horizontal.value + 1
     )
     scroll.horizontal.thumbStart = computed(
@@ -230,7 +229,7 @@ export default createComponent({
     scroll.horizontal.style = computed(() => ({
       ...props.thumbStyle,
       ...props.horizontalThumbStyle,
-      [proxy.$q.lang.rtl === true ? 'right' : 'left']:
+      [proxy.$q.lang.rtl ? 'right' : 'left']:
         `${scroll.horizontal.thumbStart.value}px`,
       width: `${scroll.horizontal.thumbSize.value}px`,
       bottom: `${props.verticalOffset[1]}px`
@@ -238,21 +237,20 @@ export default createComponent({
     scroll.horizontal.thumbClass = computed(
       () =>
         'q-scrollarea__thumb q-scrollarea__thumb--h absolute-bottom' +
-        (scroll.horizontal.thumbHidden.value === true
+        (scroll.horizontal.thumbHidden.value
           ? ' q-scrollarea__thumb--invisible'
           : '')
     )
     scroll.horizontal.barClass = computed(
       () =>
         'q-scrollarea__bar q-scrollarea__bar--h absolute-bottom' +
-        (scroll.horizontal.thumbHidden.value === true
+        (scroll.horizontal.thumbHidden.value
           ? ' q-scrollarea__bar--invisible'
           : '')
     )
 
     const mainStyle = computed(() =>
-      scroll.vertical.thumbHidden.value === true &&
-      scroll.horizontal.thumbHidden.value === true
+      scroll.vertical.thumbHidden.value && scroll.horizontal.thumbHidden.value
         ? props.contentStyle
         : props.contentActiveStyle
     )
@@ -284,7 +282,7 @@ export default createComponent({
     }, 0)
 
     function localSetScrollPosition(axis, offset, duration) {
-      if (axisList.includes(axis) === false) {
+      if (!axisList.includes(axis)) {
         console.error(
           '[QScrollArea]: wrong first param of setScrollPosition (vertical/horizontal)'
         )
@@ -312,7 +310,7 @@ export default createComponent({
         change = true
       }
 
-      if (change === true) startTimer()
+      if (change) startTimer()
     }
 
     function updateScroll({ position }) {
@@ -328,7 +326,7 @@ export default createComponent({
         change = true
       }
 
-      if (change === true) startTimer()
+      if (change) startTimer()
     }
 
     function updateScrollSize({ height, width }) {
@@ -346,18 +344,16 @@ export default createComponent({
     function onPanThumb(e, axis) {
       const data = scroll[axis]
 
-      if (e.isFirst === true) {
-        if (data.thumbHidden.value === true) return
+      if (e.isFirst) {
+        if (data.thumbHidden.value) return
 
         panRefPos = data.position.value
         panning.value = true
-      } else if (panning.value !== true) {
+      } else if (!panning.value) {
         return
       }
 
-      if (e.isFinal === true) {
-        panning.value = false
-      }
+      if (e.isFinal) panning.value = false
 
       const dProp = dirProps[axis]
 
@@ -374,7 +370,7 @@ export default createComponent({
     function onMousedown(evt, axis) {
       const data = scroll[axis]
 
-      if (data.thumbHidden.value !== true) {
+      if (!data.thumbHidden.value) {
         const startOffset =
           axis === 'vertical'
             ? props.verticalOffset[0]
@@ -454,7 +450,7 @@ export default createComponent({
         if (targetRef.value !== null) {
           setHorizontalScrollPosition(
             targetRef.value,
-            Math.abs(scroll.horizontal.position.value) * (rtl === true ? -1 : 1)
+            Math.abs(scroll.horizontal.position.value) * (rtl ? -1 : 1)
           )
         }
       }
@@ -498,7 +494,7 @@ export default createComponent({
           axis,
           percentage *
             (scroll[axis].size.value - container[axis].value) *
-            (axis === 'horizontal' && proxy.$q.lang.rtl === true ? -1 : 1),
+            (axis === 'horizontal' && proxy.$q.lang.rtl ? -1 : 1),
           duration
         )
       }

package/src/components/scroll-observer/QScrollObserver.js

@@ -1,10 +1,10 @@
-import { watch, onMounted, onBeforeUnmount, getCurrentInstance } from 'vue'
+import { getCurrentInstance, onBeforeUnmount, onMounted, watch } from 'vue'
 
 import { createComponent } from '../../utils/private.create/create.js'
 import {
+  getHorizontalScrollPosition,
   getScrollTarget,
   getVerticalScrollPosition,
-  getHorizontalScrollPosition,
   scrollTargetProp
 } from '../../utils/scroll/scroll.js'
 import { listenOpts, noop } from '../../utils/event/event.js'
@@ -93,7 +93,7 @@ export default createComponent({
       scroll.directionChanged = scroll.direction !== curDir
       scroll.delta = delta
 
-      if (scroll.directionChanged === true) {
+      if (scroll.directionChanged) {
         scroll.direction = curDir
         scroll.inflectionPoint = scroll.position
       }