quasar 2.15.2 → 2.15.3

package/src/components/circular-progress/QCircularProgress.js

@@ -1,11 +1,11 @@
 import { h, computed, getCurrentInstance } from 'vue'
 
-import useSize from '../../composables/private/use-size.js'
-import { useCircularCommonProps } from './use-circular-progress.js'
+import useSize from '../../composables/private.use-size/use-size.js'
+import { useCircularCommonProps } from './circular-progress.js'
 
-import { createComponent } from '../../utils/private/create.js'
-import { hMergeSlotSafely } from '../../utils/private/render.js'
-import { between } from '../../utils/format.js'
+import { createComponent } from '../../utils/private.create/create.js'
+import { hMergeSlotSafely } from '../../utils/private.render/render.js'
+import { between } from '../../utils/format/format.js'
 
 const
   radius = 50,

package/src/components/circular-progress/QCircularProgress.json

@@ -1,5 +1,5 @@
 {
-  "mixins": [ "composables/private/use-size" ],
+  "mixins": [ "composables/private.use-size/use-size" ],
 
   "meta": {
     "docsUrl": "https://v2.quasar.dev/vue-components/circular-progress"

package/src/components/circular-progress/{use-circular-progress.js → circular-progress.js}

@@ -1,4 +1,4 @@
-import { useSizeProps } from '../../composables/private/use-size.js'
+import { useSizeProps } from '../../composables/private.use-size/use-size.js'
 
 // also used by QKnob
 export const useCircularCommonProps = {

package/src/components/circular-progress/circular-progress.test.js

@@ -0,0 +1,14 @@
+import { describe, test, expect } from 'vitest'
+
+import { useCircularCommonProps } from './circular-progress.js'
+
+describe('[circularProgress API]', () => {
+  describe('[Variables]', () => {
+    describe('[(variable)useCircularCommonProps]', () => {
+      test('is defined correctly', () => {
+        expect(useCircularCommonProps).toBeTypeOf('object')
+        expect(Object.keys(useCircularCommonProps)).not.toHaveLength(0)
+      })
+    })
+  })
+})

package/src/components/color/QColor.js

@@ -10,16 +10,16 @@ import QTab from '../tabs/QTab.js'
 import QTabPanels from '../tab-panels/QTabPanels.js'
 import QTabPanel from '../tab-panels/QTabPanel.js'
 
-import useDark, { useDarkProps } from '../../composables/private/use-dark.js'
-import useRenderCache from '../../composables/use-render-cache.js'
-import { useFormInject, useFormProps } from '../../composables/private/use-form.js'
-
-import { createComponent } from '../../utils/private/create.js'
-import { testPattern } from '../../utils/patterns.js'
-import throttle from '../../utils/throttle.js'
-import { stop } from '../../utils/event.js'
-import { hexToRgb, rgbToHex, rgbToString, textToRgb, rgbToHsv, hsvToRgb, luminosity } from '../../utils/colors.js'
-import { hDir } from '../../utils/private/render.js'
+import useDark, { useDarkProps } from '../../composables/private.use-dark/use-dark.js'
+import useRenderCache from '../../composables/use-render-cache/use-render-cache.js'
+import { useFormInject, useFormProps } from '../../composables/use-form/private.use-form.js'
+
+import { createComponent } from '../../utils/private.create/create.js'
+import { testPattern } from '../../utils/patterns/patterns.js'
+import throttle from '../../utils/throttle/throttle.js'
+import { stop } from '../../utils/event/event.js'
+import { hexToRgb, rgbToHex, rgbToString, textToRgb, rgbToHsv, hsvToRgb, luminosity } from '../../utils/colors/colors.js'
+import { hDir } from '../../utils/private.render/render.js'
 
 const palette = [
   'rgb(255,204,204)', 'rgb(255,230,204)', 'rgb(255,255,204)', 'rgb(204,255,204)', 'rgb(204,255,230)', 'rgb(204,255,255)', 'rgb(204,230,255)', 'rgb(204,204,255)', 'rgb(230,204,255)', 'rgb(255,204,255)',

package/src/components/color/QColor.json

@@ -1,5 +1,5 @@
 {
-  "mixins": [ "composables/private/use-form" ],
+  "mixins": [ "composables/use-form/private.use-form" ],
 
   "meta": {
     "docsUrl": "https://v2.quasar.dev/vue-components/color-picker"

package/src/components/date/QDate.js

@@ -2,17 +2,17 @@ import { h, ref, computed, watch, Transition, nextTick, getCurrentInstance } fro
 
 import QBtn from '../btn/QBtn.js'
 
-import useDark, { useDarkProps } from '../../composables/private/use-dark.js'
-import useRenderCache from '../../composables/use-render-cache.js'
-import { useFormProps, useFormAttrs, useFormInject } from '../../composables/private/use-form.js'
+import useDark, { useDarkProps } from '../../composables/private.use-dark/use-dark.js'
+import useRenderCache from '../../composables/use-render-cache/use-render-cache.js'
+import { useFormProps, useFormAttrs, useFormInject } from '../../composables/use-form/private.use-form.js'
 import useDatetime, { useDatetimeProps, useDatetimeEmits, getDayHash } from './use-datetime.js'
 
-import { createComponent } from '../../utils/private/create.js'
-import { hSlot } from '../../utils/private/render.js'
-import { formatDate, __splitDate, getDateDiff } from '../../utils/date.js'
-import { pad } from '../../utils/format.js'
-import { jalaaliMonthLength, toGregorian } from '../../utils/private/date-persian.js'
-import { isObject } from '../../utils/is.js'
+import { createComponent } from '../../utils/private.create/create.js'
+import { hSlot } from '../../utils/private.render/render.js'
+import { formatDate, __splitDate, getDateDiff } from '../../utils/date/date.js'
+import { pad } from '../../utils/format/format.js'
+import { jalaaliMonthLength, toGregorian } from '../../utils/date/private.persian.js'
+import { isObject } from '../../utils/is/is.js'
 
 const yearsInterval = 20
 const views = [ 'Calendar', 'Years', 'Months' ]

package/src/components/date/QDate.json

@@ -73,8 +73,8 @@
         "desc": "If true, the current date will be highlighted"
       },
       "examples": [
-        "['2018/11/05', '2018/11/06', '2018/11/09', '2018/11/23']",
-        "date => date[9] % 3 === 0"
+        "[ '2018/11/05', '2018/11/06', '2018/11/09', '2018/11/23' ]",
+        "date => (date[ 9 ] % 3 === 0)"
       ],
       "category": "model"
     },
@@ -96,7 +96,7 @@
       },
       "examples": [
         "'teal-10'",
-        "(date) => date[9] % 2 === 0 ? 'teal' : 'orange'"
+        "date => (date[ 9 ] % 2 === 0 ? 'teal' : 'orange')"
       ],
       "category": "style"
     },
@@ -116,9 +116,9 @@
         "desc": "If true, the current date will be made available for selection"
       },
       "examples": [
-        "['2018/11/05', '2018/11/12', '2018/11/19', '2018/11/26' ]",
-        "date => date[9] % 3 === 0",
-        "date => date >= '2018/11/03' && date <= '2018/11/15'"
+        "[ '2018/11/05', '2018/11/12', '2018/11/19', '2018/11/26' ]",
+        "date => (date[ 9 ] % 3 === 0)",
+        "date => (date >= '2018/11/03' && date <= '2018/11/15')"
       ],
       "category": "model"
     },
@@ -380,7 +380,9 @@
 
   "methods": {
     "setToday": {
-      "desc": "Change model to today"
+      "desc": "Change model to today",
+      "params": null,
+      "returns": null
     },
 
     "setView": {
@@ -392,7 +394,8 @@
           "desc": "QDate view name",
           "values": [ "'Calendar'", "'Months'", "'Years'" ]
         }
-      }
+      },
+      "returns": null
     },
 
     "offsetCalendar": {
@@ -408,7 +411,8 @@
           "type": "Boolean",
           "desc": "Decrement?"
         }
-      }
+      },
+      "returns": null
     },
 
     "setCalendarTo": {
@@ -422,7 +426,8 @@
           "type": "Number",
           "desc": "The month"
         }
-      }
+      },
+      "returns": null
     },
 
     "setEditingRange": {
@@ -464,7 +469,8 @@
             }
           }
         }
-      }
+      },
+      "returns": null
     }
   }
 }

package/src/components/date/use-datetime.js

@@ -1,7 +1,7 @@
 import { computed } from 'vue'
 
-import { toJalaali } from '../../utils/private/date-persian.js'
-import { pad } from '../../utils/format.js'
+import { toJalaali } from '../../utils/date/private.persian.js'
+import { pad } from '../../utils/format/format.js'
 
 const calendars = [ 'gregorian', 'persian' ]
 

package/src/components/date/use-datetime.json

@@ -1,5 +1,5 @@
 {
-  "mixins": [ "composables/private/use-form" ],
+  "mixins": [ "composables/use-form/private.use-form" ],
 
   "props": {
     "landscape": {
@@ -17,27 +17,27 @@
     "locale": {
       "type": "Object",
       "desc": "Locale formatting options",
-      "examples": [ "{ monthsShort: ['Ian', 'Feb', 'Mar', '...'] }" ],
+      "examples": [ "{ monthsShort: [ 'Ian', 'Feb', 'Mar', '...' ] }" ],
       "definition": {
         "days": {
           "type": "Array",
           "desc": "List of full day names (DDDD), starting with Sunday",
-          "examples": [ "['Duminica', 'Luni', 'Marti', '...']" ]
+          "examples": [ "[ 'Duminica', 'Luni', 'Marti', '...' ]" ]
         },
         "daysShort": {
           "type": "Array",
           "desc": "List of short day names (DDD), starting with Sunday",
-          "examples": [ "['Dum', 'Lun', 'Mar', '...']" ]
+          "examples": [ "[ 'Dum', 'Lun', 'Mar', '...' ]" ]
         },
         "months": {
           "type": "Array",
           "desc": "List of full month names (MMMM), starting with January",
-          "examples": [ "['Ianuarie', 'Februarie', 'Martie', '...']" ]
+          "examples": [ "[ 'Ianuarie', 'Februarie', 'Martie', '...' ]" ]
         },
         "monthsShort": {
           "type": "Array",
           "desc": "List of short month names (MMM), starting with January",
-          "examples": [ "['Ian', 'Feb', 'Mar', '...']" ]
+          "examples": [ "[ 'Ian', 'Feb', 'Mar', '...' ]" ]
         }
       },
       "category": "model"

package/src/components/dialog/QDialog.js

@@ -1,19 +1,19 @@
 import { h, ref, computed, watch, onBeforeUnmount, Transition, getCurrentInstance } from 'vue'
 
-import useHistory from '../../composables/private/use-history.js'
-import useTimeout from '../../composables/use-timeout.js'
-import useTick from '../../composables/use-tick.js'
-import useModelToggle, { useModelToggleProps, useModelToggleEmits } from '../../composables/private/use-model-toggle.js'
-import useTransition, { useTransitionProps } from '../../composables/private/use-transition.js'
-import usePortal from '../../composables/private/use-portal.js'
-import usePreventScroll from '../../composables/private/use-prevent-scroll.js'
-
-import { createComponent } from '../../utils/private/create.js'
-import { childHasFocus } from '../../utils/dom.js'
-import { hSlot } from '../../utils/private/render.js'
-import { addEscapeKey, removeEscapeKey } from '../../utils/private/escape-key.js'
-import { addFocusout, removeFocusout } from '../../utils/private/focusout.js'
-import { addFocusFn } from '../../utils/private/focus-manager.js'
+import useHistory from '../../composables/private.use-history/use-history.js'
+import useTimeout from '../../composables/use-timeout/use-timeout.js'
+import useTick from '../../composables/use-tick/use-tick.js'
+import useModelToggle, { useModelToggleProps, useModelToggleEmits } from '../../composables/private.use-model-toggle/use-model-toggle.js'
+import useTransition, { useTransitionProps } from '../../composables/private.use-transition/use-transition.js'
+import usePortal from '../../composables/private.use-portal/use-portal.js'
+import usePreventScroll from '../../composables/private.use-prevent-scroll/use-prevent-scroll.js'
+
+import { createComponent } from '../../utils/private.create/create.js'
+import { childHasFocus } from '../../utils/dom/dom.js'
+import { hSlot } from '../../utils/private.render/render.js'
+import { addEscapeKey, removeEscapeKey } from '../../utils/private.keyboard/escape-key.js'
+import { addFocusout, removeFocusout } from '../../utils/private.focus/focusout.js'
+import { addFocusFn } from '../../utils/private.focus/focus-manager.js'
 
 let maximizedModals = 0
 
@@ -235,6 +235,7 @@ export default createComponent({
           ? refocusTarget.closest('[tabindex]:not([tabindex^="-"])')
           : void 0
         ) || refocusTarget).focus()
+
         refocusTarget = null
       }
 
@@ -250,16 +251,26 @@ export default createComponent({
       addFocusFn(() => {
         let node = innerRef.value
 
-        if (node === null || node.contains(document.activeElement) === true) {
-          return
+        if (node === null) return
+
+        if (selector !== void 0) {
+          const target = node.querySelector(selector)
+          if (target !== null) {
+            target.focus({ preventScroll: true })
+            return
+          }
         }
 
-        node = (selector !== '' ? node.querySelector(selector) : null)
-          || node.querySelector('[autofocus][tabindex], [data-autofocus][tabindex]')
-          || node.querySelector('[autofocus] [tabindex], [data-autofocus] [tabindex]')
-          || node.querySelector('[autofocus], [data-autofocus]')
-          || node
-        node.focus({ preventScroll: true })
+        if (node.contains(document.activeElement) !== true) {
+          node = (
+            node.querySelector('[autofocus][tabindex], [data-autofocus][tabindex]')
+            || node.querySelector('[autofocus] [tabindex], [data-autofocus] [tabindex]')
+            || node.querySelector('[autofocus], [data-autofocus]')
+            || node
+          )
+
+          node.focus({ preventScroll: true })
+        }
       })
     }
 

package/src/components/dialog/QDialog.json

@@ -1,5 +1,5 @@
 {
-  "mixins": [ "composables/private/use-model-toggle", "composables/private/use-portal", "composables/private/use-transition" ],
+  "mixins": [ "composables/private.use-model-toggle/use-model-toggle", "composables/private.use-portal/use-portal", "composables/private.use-transition/use-transition" ],
 
   "meta": {
     "docsUrl": "https://v2.quasar.dev/vue-components/dialog"
@@ -141,7 +141,8 @@
           "examples": [ "'[tabindex]:not([tabindex=\"-1\"])'" ],
           "addedIn": "v2.6.5"
         }
-      }
+      },
+      "returns": null
     },
 
     "shake": {
@@ -153,7 +154,8 @@
           "examples": [ "document.getElementById('example')" ],
           "addedIn": "v2.10.1"
         }
-      }
+      },
+      "returns": null
     }
   },