quasar 2.12.6 → 2.13.0

package/src/components/input/use-mask.js

@@ -304,7 +304,12 @@ export default function (props, emit, emitValue, inputRef) {
       ? unmaskValue(masked)
       : masked
 
-    String(props.modelValue) !== val && emitValue(val, true)
+    if (
+      String(props.modelValue) !== val
+      && (props.modelValue !== null || val !== '')
+    ) {
+      emitValue(val, true)
+    }
   }
 
   function moveCursorForPaste (inp, start, end) {

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

@@ -352,11 +352,26 @@ export default createComponent({
       targetRef.value[ dirProps[ axis ].scroll ] = offset
     }
 
+    let mouseEventTimer = null
+
     function onMouseenter () {
-      hover.value = true
+      if (mouseEventTimer !== null) {
+        clearTimeout(mouseEventTimer)
+      }
+
+      // setTimeout needed for iOS; see ticket #16210
+      mouseEventTimer = setTimeout(() => {
+        mouseEventTimer = null
+        hover.value = true
+      }, proxy.$q.platform.is.ios ? 50 : 0)
     }
 
     function onMouseleave () {
+      if (mouseEventTimer !== null) {
+        clearTimeout(mouseEventTimer)
+        mouseEventTimer = null
+      }
+
       hover.value = false
     }
 

package/src/components/select/QSelect.js

@@ -143,7 +143,8 @@ export default createComponent({
     const dialogFieldFocused = ref(false)
     const innerLoadingIndicator = ref(false)
 
-    let inputTimer = null, innerValueCache,
+    let filterTimer = null, inputValueTimer = null,
+      innerValueCache,
       hasDialog, userInputValue, filterId = null, defaultInputValue,
       transitionShowComputed, searchBuffer, searchBufferExp
 
@@ -588,9 +589,11 @@ export default createComponent({
           scrollTo(index)
 
           if (skipInputValue !== true && props.useInput === true && props.fillInput === true) {
-            setInputValue(index >= 0
-              ? getOptionLabel.value(props.options[ index ])
-              : defaultInputValue
+            setInputValue(
+              index >= 0
+                ? getOptionLabel.value(props.options[ index ])
+                : defaultInputValue,
+              true
             )
           }
         }
@@ -651,9 +654,13 @@ export default createComponent({
 
       e.target.value = ''
 
-      if (inputTimer !== null) {
-        clearTimeout(inputTimer)
-        inputTimer = null
+      if (filterTimer !== null) {
+        clearTimeout(filterTimer)
+        filterTimer = null
+      }
+      if (inputValueTimer !== null) {
+        clearTimeout(inputValueTimer)
+        inputValueTimer = null
       }
 
       resetInputValue()
@@ -744,6 +751,10 @@ export default createComponent({
       // backspace
       if (
         e.keyCode === 8
+        && (
+          props.useChips === true
+          || props.clearable === true
+        )
         && props.hideSelected !== true
         && inputValue.value.length === 0
       ) {
@@ -838,7 +849,7 @@ export default createComponent({
             scrollTo(index)
 
             if (index >= 0 && props.useInput === true && props.fillInput === true) {
-              setInputValue(getOptionLabel.value(props.options[ index ]))
+              setInputValue(getOptionLabel.value(props.options[ index ]), true)
             }
           })
         }
@@ -1024,9 +1035,13 @@ export default createComponent({
     }
 
     function onInput (e) {
-      if (inputTimer !== null) {
-        clearTimeout(inputTimer)
-        inputTimer = null
+      if (filterTimer !== null) {
+        clearTimeout(filterTimer)
+        filterTimer = null
+      }
+      if (inputValueTimer !== null) {
+        clearTimeout(inputValueTimer)
+        inputValueTimer = null
       }
 
       if (e && e.target && e.target.qComposing === true) {
@@ -1047,17 +1062,26 @@ export default createComponent({
       }
 
       if (props.onFilter !== void 0) {
-        inputTimer = setTimeout(() => {
-          inputTimer = null
+        filterTimer = setTimeout(() => {
+          filterTimer = null
           filter(inputValue.value)
         }, props.inputDebounce)
       }
     }
 
-    function setInputValue (val) {
+    function setInputValue (val, emitImmediately) {
       if (inputValue.value !== val) {
         inputValue.value = val
-        emit('inputValue', val)
+
+        if (emitImmediately === true || props.inputDebounce === 0 || props.inputDebounce === '0') {
+          emit('inputValue', val)
+        }
+        else {
+          inputValueTimer = setTimeout(() => {
+            inputValueTimer = null
+            emit('inputValue', val)
+          }, props.inputDebounce)
+        }
       }
     }
 
@@ -1065,7 +1089,7 @@ export default createComponent({
       userInputValue = internal !== true
 
       if (props.useInput === true) {
-        setInputValue(val)
+        setInputValue(val, true)
 
         if (noFiltering === true || internal !== true) {
           defaultInputValue = val
@@ -1418,7 +1442,8 @@ export default createComponent({
     updatePreState()
 
     onBeforeUnmount(() => {
-      inputTimer !== null && clearTimeout(inputTimer)
+      filterTimer !== null && clearTimeout(filterTimer)
+      inputValueTimer !== null && clearTimeout(inputValueTimer)
     })
 
     // expose public methods

package/src/components/select/QSelect.json

@@ -270,7 +270,7 @@
 
     "input-debounce": {
       "type": [ "Number", "String" ],
-      "desc": "Debounce the input model update with an amount of milliseconds",
+      "desc": "Debounce the input model update with an amount of milliseconds (also affects the 'filter' event, if used)",
       "default": 500,
       "category": "content"
     },

package/src/components/select/__tests__/QSelect.cy.js

@@ -1258,7 +1258,8 @@ describe('QSelect API', () => {
           props: {
             modelValue: null,
             onInputValue: fn,
-            useInput: true
+            useInput: true,
+            inputDebounce: 0
           }
         })
 

package/src/components/slider/use-slider.js

@@ -220,9 +220,12 @@ export default function ({ updateValue, updatePosition, getDragging, formAttrs }
     + (props.innerTrackColor !== void 0 ? ` bg-${ props.innerTrackColor }` : '')
   )
   const innerBarStyle = computed(() => {
+    const innerDiff = innerMaxRatio.value - innerMinRatio.value
     const acc = {
       [ positionProp.value ]: `${ 100 * innerMinRatio.value }%`,
-      [ sizeProp.value ]: `${ 100 * (innerMaxRatio.value - innerMinRatio.value) }%`
+      [ sizeProp.value ]: innerDiff === 0
+        ? '2px'
+        : `${ 100 * innerDiff }%`
     }
     if (props.innerTrackImg !== void 0) {
       acc.backgroundImage = `url(${ props.innerTrackImg }) !important`
@@ -316,18 +319,16 @@ export default function ({ updateValue, updatePosition, getDragging, formAttrs }
   }))
 
   const markerStyle = computed(() => {
-    if (innerBarLen.value !== 0) {
-      const size = 100 * markerStep.value / innerBarLen.value
-
-      return {
-        ...innerBarStyle.value,
-        backgroundSize: props.vertical === true
-          ? `2px ${ size }%`
-          : `${ size }% 2px`
-      }
-    }
+    const size = innerBarLen.value === 0
+      ? '2px'
+      : 100 * markerStep.value / innerBarLen.value
 
-    return null
+    return {
+      ...innerBarStyle.value,
+      backgroundSize: props.vertical === true
+        ? `2px ${ size }%`
+        : `${ size }% 2px`
+    }
   })
 
   function getMarkerList (def) {

package/src/components/table/QTable.json

@@ -187,7 +187,7 @@
         },
         "sort": {
           "type": "Function",
-          "desc": "Compare function if you have some custom data or want a specific way to compare two rows",
+          "desc": "Compare function if you have some custom data or want a specific way to compare two rows; rows with null/undefined values will get sorted without triggering this method (use 'rawSort' instead if you want to handle those values too)",
           "examples": ["(a, b, rowA, rowB) => parseInt(a, 10) - parseInt(b, 10)"],
           "params": {
             "a": {
@@ -221,6 +221,43 @@
             "examples": [ "-1", "0", "1" ]
           }
         },
+        "rawSort": {
+          "type": "Function",
+          "desc": "Compare function if you have some custom data or want a specific way to compare two rows; includes rows with null/undefined values (use 'sort' instead if you don't want that)",
+          "examples": ["(a, b, rowA, rowB) => parseInt(a, 10) - parseInt(b, 10)"],
+          "params": {
+            "a": {
+              "type": "Any",
+              "required": true,
+              "desc": "Value of the first comparison term",
+              "examples": [ 123, "abc" ]
+            },
+            "b": {
+              "type": "Any",
+              "required": true,
+              "desc": "Value of the second comparison term",
+              "examples": [ 123, "abc" ]
+            },
+            "rowA": {
+              "type": "Object",
+              "required": true,
+              "desc": "Full Row object in which is contained the first term",
+              "examples": [ "{ name: 'Potassium', value: 'K' }" ]
+            },
+            "rowB": {
+              "type": "Object",
+              "required": true,
+              "desc": "Full Row object in which is contained the second term",
+              "examples": [ "{ name: 'Fluorine', value: 'F' }" ]
+            }
+          },
+          "returns": {
+            "type": "Number",
+            "desc": "Comparison result of term 'a' with term 'b'. Less than 0 when 'a' should come first; greater than 0 if 'b' should come first; equal to 0 if their position must not be changed with respect to each other",
+            "examples": [ "-1", "0", "1" ]
+          },
+          "addedIn": "v2.13.0"
+        },
         "sortOrder": {
           "type": "String",
           "desc": "Set column sort order: 'ad' (ascending-descending) or 'da' (descending-ascending); Overrides the 'column-sort-order' prop",

package/src/components/table/table-sort.js

@@ -42,6 +42,9 @@ export function useTableSort (props, computedPagination, colList, setPagination)
               A = val(a),
               B = val(b)
 
+            if (col.rawSort !== void 0) {
+              return col.rawSort(A, B, a, b) * dir
+            }
             if (A === null || A === void 0) {
               return -1 * dir
             }
@@ -49,6 +52,8 @@ export function useTableSort (props, computedPagination, colList, setPagination)
               return 1 * dir
             }
             if (col.sort !== void 0) {
+              // gets called without rows that have null/undefined as value
+              // due to the above two statements
               return col.sort(A, B, a, b) * dir
             }
             if (isNumber(A) === true && isNumber(B) === true) {

package/src/components/time/QTime.js

@@ -706,23 +706,36 @@ export default createComponent({
       }
     }
 
+    function goToViewWhenHasModel (newView) {
+      const model = props.modelValue
+      if (
+        view.value !== newView
+        && model !== void 0
+        && model !== null
+        && model !== ''
+        && typeof model !== 'string'
+      ) {
+        view.value = newView
+      }
+    }
+
     function verifyAndUpdate () {
       if (hourInSelection.value !== null && hourInSelection.value(innerModel.value.hour) !== true) {
         innerModel.value = __splitDate()
-        view.value = 'hour'
+        goToViewWhenHasModel('hour')
         return
       }
 
       if (minuteInSelection.value !== null && minuteInSelection.value(innerModel.value.minute) !== true) {
         innerModel.value.minute = null
         innerModel.value.second = null
-        view.value = 'minute'
+        goToViewWhenHasModel('minute')
         return
       }
 
       if (props.withSeconds === true && secondInSelection.value !== null && secondInSelection.value(innerModel.value.second) !== true) {
         innerModel.value.second = null
-        view.value = 'second'
+        goToViewWhenHasModel('second')
         return
       }
 

package/src/components/tree/QTree.js

@@ -499,6 +499,7 @@ export default createComponent({
       let body = node.body
         ? slots[ `body-${ node.body }` ] || slots[ 'default-body' ]
         : slots[ 'default-body' ]
+
       const slotScope = header !== void 0 || body !== void 0
         ? getSlotScope(node, m, key)
         : null
@@ -522,6 +523,8 @@ export default createComponent({
             + (m.selected === true ? ' q-tree__node--selected' : '')
             + (m.disabled === true ? ' q-tree__node--disabled' : ''),
           tabindex: m.link === true ? 0 : -1,
+          ariaExpanded: children.length > 0 ? m.expanded : null,
+          role: 'treeitem',
           onClick: (e) => {
             onClick(node, m, e)
           },
@@ -586,16 +589,21 @@ export default createComponent({
         isParent === true
           ? (
               props.noTransition === true
-                ? h('div', {
-                  class: 'q-tree__node-collapsible' + textColorClass.value,
-                  key: `${ key }__q`
-                }, [
-                  body,
-                  h('div', {
-                    class: 'q-tree__children'
-                      + (m.disabled === true ? ' q-tree__node--disabled' : '')
-                  }, m.expanded ? children : null)
-                ])
+                ? (
+                    m.expanded === true
+                      ? h('div', {
+                        class: 'q-tree__node-collapsible' + textColorClass.value,
+                        key: `${ key }__q`
+                      }, [
+                        body,
+                        h('div', {
+                          class: 'q-tree__children'
+                            + (m.disabled === true ? ' q-tree__node--disabled' : ''),
+                          role: 'group'
+                        }, children)
+                      ])
+                      : null
+                  )
 
                 : h(QSlideTransition, {
                   duration: props.duration,
@@ -609,7 +617,8 @@ export default createComponent({
                     body,
                     h('div', {
                       class: 'q-tree__children'
-                        + (m.disabled === true ? ' q-tree__node--disabled' : '')
+                        + (m.disabled === true ? ' q-tree__node--disabled' : ''),
+                      role: 'group'
                     }, children)
                   ]),
                   [ [ vShow, m.expanded ] ]
@@ -703,7 +712,8 @@ export default createComponent({
 
       return h(
         'div', {
-          class: classes.value
+          class: classes.value,
+          role: 'tree'
         },
         children.length === 0
           ? (

package/src/composables/private/__tests__/FieldWrapper.vue

@@ -1,6 +1,10 @@
 <template>
   <div style="margin: 150px auto" class="row justify-center" data-cy="wrapper">
-    <q-select data-cy="select" class="select-root" ref="compRef" v-bind="$attrs" style="min-width: 300px"></q-select>
+    <q-select data-cy="select" class="select-root" ref="compRef" v-bind="$attrs" style="min-width: 300px">
+      <template v-for="(_, name) in $slots" #[name]>
+        <slot :name="name" />
+      </template>
+    </q-select>
   </div>
   <q-btn class="hidden" data-cy="method-show" @click="show" />
   <q-btn class="hidden" data-cy="method-hide" @click="hide" />
@@ -32,7 +36,18 @@ export default defineComponent({
       compRef.value.focus()
     }
 
-    return { compRef, show, hide, toggle, focusMethod }
+    function blur () {
+      compRef.value.blur()
+    }
+
+    function validate () {
+      compRef.value.validate()
+    }
+
+    function resetValidation () {
+      compRef.value.resetValidation()
+    }
+    return { compRef, show, hide, toggle, focusMethod, blur, validate, resetValidation }
   }
 })