quasar 2.2.0 → 2.2.4

package/src/directives/Scroll.js

@@ -1,3 +1,4 @@
+import { createDirective } from '../utils/private/create.js'
 import { getScrollTarget, getVerticalScrollPosition, getHorizontalScrollPosition } from '../utils/scroll.js'
 import { listenOpts } from '../utils/event.js'
 import getSSRProps from '../utils/private/noop-ssr-directive-transform.js'
@@ -14,7 +15,7 @@ function update (ctx, { value, oldValue }) {
   }
 }
 
-export default __QUASAR_SSR_SERVER__
+export default createDirective(__QUASAR_SSR_SERVER__
   ? { name: 'scroll', getSSRProps }
   : {
       name: 'scroll',
@@ -47,3 +48,4 @@ export default __QUASAR_SSR_SERVER__
         delete el.__qscroll
       }
     }
+)

package/src/directives/ScrollFire.js

@@ -1,3 +1,4 @@
+import { createDirective } from '../utils/private/create.js'
 import debounce from '../utils/debounce.js'
 import { height, offset } from '../utils/dom.js'
 import { getScrollTarget } from '../utils/scroll.js'
@@ -19,7 +20,7 @@ function update (ctx, { value, oldValue }) {
   }
 }
 
-export default __QUASAR_SSR_SERVER__
+export default createDirective(__QUASAR_SSR_SERVER__
   ? { name: 'scroll-fire', getSSRProps }
   : {
       name: 'scroll-fire',
@@ -63,3 +64,4 @@ export default __QUASAR_SSR_SERVER__
         delete el.__qscrollfire
       }
     }
+)

package/src/directives/TouchHold.js

@@ -1,9 +1,11 @@
 import { client } from '../plugins/Platform.js'
+
+import { createDirective } from '../utils/private/create.js'
 import { addEvt, cleanEvt, position, leftClick, stopAndPrevent, noop } from '../utils/event.js'
 import { clearSelection } from '../utils/private/selection.js'
 import getSSRProps from '../utils/private/noop-ssr-directive-transform.js'
 
-export default __QUASAR_SSR_SERVER__
+export default createDirective(__QUASAR_SSR_SERVER__
   ? { name: 'touch-hold', getSSRProps }
   : {
       name: 'touch-hold',
@@ -157,3 +159,4 @@ export default __QUASAR_SSR_SERVER__
         }
       }
     }
+)

package/src/directives/TouchPan.js

@@ -1,4 +1,6 @@
 import { client } from '../plugins/Platform.js'
+
+import { createDirective } from '../utils/private/create.js'
 import { getModifierDirections, shouldStart } from '../utils/private/touch.js'
 import { addEvt, cleanEvt, position, leftClick, prevent, stop, stopAndPrevent, preventDraggable, noop } from '../utils/event.js'
 import { clearSelection } from '../utils/private/selection.js'
@@ -117,7 +119,7 @@ function getChanges (evt, ctx, isFinal) {
 
 let uid = 0
 
-export default __QUASAR_SSR_SERVER__
+export default createDirective(__QUASAR_SSR_SERVER__
   ? { name: 'touch-pan', getSSRProps }
   : {
       name: 'touch-pan',
@@ -422,3 +424,4 @@ export default __QUASAR_SSR_SERVER__
         }
       }
     }
+)

package/src/directives/TouchRepeat.js

@@ -1,4 +1,6 @@
 import { client } from '../plugins/Platform.js'
+
+import { createDirective } from '../utils/private/create.js'
 import { addEvt, cleanEvt, position, leftClick, stopAndPrevent, noop } from '../utils/event.js'
 import { clearSelection } from '../utils/private/selection.js'
 import { isKeyCode } from '../utils/private/key-composition.js'
@@ -25,7 +27,7 @@ function shouldEnd (evt, origin) {
     || Math.abs(top - origin.top) >= 7
 }
 
-export default __QUASAR_SSR_SERVER__
+export default createDirective(__QUASAR_SSR_SERVER__
   ? { name: 'touch-repeat', getSSRProps }
   : {
       name: 'touch-repeat',
@@ -239,3 +241,4 @@ export default __QUASAR_SSR_SERVER__
         }
       }
     }
+)

package/src/directives/TouchSwipe.js

@@ -1,4 +1,6 @@
 import { client } from '../plugins/Platform.js'
+
+import { createDirective } from '../utils/private/create.js'
 import { getModifierDirections, shouldStart } from '../utils/private/touch.js'
 import { addEvt, cleanEvt, position, leftClick, stopAndPrevent, preventDraggable, noop } from '../utils/event.js'
 import { clearSelection } from '../utils/private/selection.js'
@@ -20,7 +22,7 @@ function parseArg (arg) {
   return data
 }
 
-export default __QUASAR_SSR_SERVER__
+export default createDirective(__QUASAR_SSR_SERVER__
   ? { name: 'touch-swipe', getSSRProps }
   : {
       name: 'touch-swipe',
@@ -263,3 +265,4 @@ export default __QUASAR_SSR_SERVER__
         }
       }
     }
+)

package/src/plugins/Notify.js

@@ -1,10 +1,11 @@
-import { h, defineComponent, ref, markRaw, TransitionGroup } from 'vue'
+import { h, ref, markRaw, TransitionGroup } from 'vue'
 
 import QAvatar from '../components/avatar/QAvatar.js'
 import QIcon from '../components/icon/QIcon.js'
 import QBtn from '../components/btn/QBtn.js'
 import QSpinner from '../components/spinner/QSpinner.js'
 
+import { createComponent } from '../utils/private/create.js'
 import { noop } from '../utils/event.js'
 import { createGlobalNode } from '../utils/private/global-nodes.js'
 import { createChildApp } from '../install-quasar.js'
@@ -62,9 +63,9 @@ function logError (error, config) {
 }
 
 function getComponent ($q) {
-  return defineComponent({
+  return createComponent({
     name: 'QNotifications',
-    
+
     // hide App from Vue devtools
     devtools: { hide: true },
 

package/src/utils/create-uploader-component.js

@@ -1,8 +1,8 @@
-import { defineComponent } from 'vue'
-
 import { coreProps, coreEmits, getRenderer } from '../components/uploader/uploader-core.js'
 
-export default ({ name, props, emits, injectPlugin }) => defineComponent({
+import { createComponent } from './private/create.js'
+
+export default ({ name, props, emits, injectPlugin }) => createComponent({
   name,
 
   props: {

package/src/utils/date.js

@@ -161,6 +161,96 @@ function getDateLocale (paramDateLocale, langProps) {
       )
 }
 
+function formatTimezone (offset, delimeter = '') {
+  const
+    sign = offset > 0 ? '-' : '+',
+    absOffset = Math.abs(offset),
+    hours = Math.floor(absOffset / 60),
+    minutes = absOffset % 60
+
+  return sign + pad(hours) + delimeter + pad(minutes)
+}
+
+function applyYearMonthDayChange (date, mod, sign) {
+  let
+    year = date.getFullYear(),
+    month = date.getMonth(),
+    day = date.getDate()
+
+  if (mod.years !== void 0) {
+    year += sign * mod.years
+  }
+
+  if (mod.months !== void 0) {
+    month += sign * mod.months
+  }
+
+  if (mod.days !== void 0) {
+    day += sign * mod.days
+  }
+
+  date.setDate(1)
+  date.setMonth(2)
+
+  date.setFullYear(year)
+  date.setMonth(month)
+  date.setDate(day)
+
+  return date
+}
+
+function getChange (date, mod, sign) {
+  const
+    d = new Date(date),
+    t = mod.years !== void 0 || mod.months !== void 0 || mod.days !== void 0
+      ? applyYearMonthDayChange(d, mod, sign)
+      : d
+
+  Object.keys(mod).forEach(key => {
+    if (key !== 'years' && key !== 'months' && key !== 'days') {
+      const op = capitalize(key)
+      t[ `set${ op }` ](t[ `get${ op }` ]() + sign * mod[ key ])
+    }
+  })
+
+  return t
+}
+
+function applyYearMonthDay (date, mod, middle) {
+  const
+    year = mod.year !== void 0 ? mod.year : date[ `get${ middle }FullYear` ](),
+    month = mod.month !== void 0 ? mod.month - 1 : date[ `get${ middle }Month` ](),
+    maxDay = (new Date(year, month + 1, 0)).getDate(),
+    day = Math.min(maxDay, mod.date !== void 0 ? mod.date : date[ `get${ middle }Date` ]())
+
+  date[ `set${ middle }Date` ](1)
+  date[ `set${ middle }Month` ](2)
+
+  date[ `set${ middle }FullYear` ](year)
+  date[ `set${ middle }Month` ](month)
+  date[ `set${ middle }Date` ](day)
+
+  return date
+}
+
+export function adjustDate (date, mod, utc) {
+  const
+    middle = utc === true ? 'UTC' : '',
+    d = new Date(date),
+    t = mod.year !== void 0 || mod.month !== void 0 || mod.date !== void 0
+      ? applyYearMonthDay(d, mod, middle)
+      : d
+
+  Object.keys(mod).forEach(key => {
+    if (key !== 'year' && key !== 'month' && key !== 'date') {
+      const op = key.charAt(0).toUpperCase() + key.slice(1)
+      t[ `set${ middle }${ op }` ](mod[ key ])
+    }
+  })
+
+  return t
+}
+
 export function extractDate (str, mask, dateLocale) {
   const d = __splitDate(str, mask, dateLocale)
 
@@ -178,7 +268,7 @@ export function extractDate (str, mask, dateLocale) {
 
   return d.timezoneOffset === null || d.timezoneOffset === tzOffset
     ? date
-    : getChange(date, { minutes: d.timezoneOffset - tzOffset }, true)
+    : getChange(date, { minutes: d.timezoneOffset - tzOffset }, 1)
 }
 
 export function __splitDate (str, mask, dateLocale, calendar, defaultModel) {
@@ -313,49 +403,12 @@ export function __splitDate (str, mask, dateLocale, calendar, defaultModel) {
     }
   }
 
-  date.dateHash = date.year + '/' + pad(date.month) + '/' + pad(date.day)
+  date.dateHash = pad(date.year, 6) + '/' + pad(date.month) + '/' + pad(date.day)
   date.timeHash = pad(date.hour) + ':' + pad(date.minute) + ':' + pad(date.second) + tzString
 
   return date
 }
 
-function formatTimezone (offset, delimeter = '') {
-  const
-    sign = offset > 0 ? '-' : '+',
-    absOffset = Math.abs(offset),
-    hours = Math.floor(absOffset / 60),
-    minutes = absOffset % 60
-
-  return sign + pad(hours) + delimeter + pad(minutes)
-}
-
-function setMonth (date, newMonth /* 1-based */) {
-  const
-    test = new Date(date.getFullYear(), newMonth, 0, 0, 0, 0, 0),
-    days = test.getDate()
-
-  date.setMonth(newMonth - 1, Math.min(days, date.getDate()))
-}
-
-function getChange (date, mod, add) {
-  const
-    t = new Date(date),
-    sign = (add ? 1 : -1)
-
-  Object.keys(mod).forEach(key => {
-    if (key === 'months') {
-      setMonth(t, t.getMonth() + 1 + sign * mod.months)
-      return
-    }
-
-    const op = key === 'years'
-      ? 'FullYear'
-      : capitalize(key === 'days' ? 'date' : key)
-    t[ `set${ op }` ](t[ `get${ op }` ]() + sign * mod[ key ])
-  })
-  return t
-}
-
 export function isValid (date) {
   return typeof date === 'number'
     ? true
@@ -413,30 +466,10 @@ export function isBetweenDates (date, from, to, opts = {}) {
 }
 
 export function addToDate (date, mod) {
-  return getChange(date, mod, true)
+  return getChange(date, mod, 1)
 }
 export function subtractFromDate (date, mod) {
-  return getChange(date, mod, false)
-}
-
-export function adjustDate (date, mod, utc) {
-  const
-    t = new Date(date),
-    prefix = `set${ utc === true ? 'UTC' : '' }`
-
-  Object.keys(mod).forEach(key => {
-    if (key === 'month') {
-      setMonth(t, mod.month)
-      return
-    }
-
-    const op = key === 'year'
-      ? 'FullYear'
-      : key.charAt(0).toUpperCase() + key.slice(1)
-    t[ `${ prefix }${ op }` ](mod[ key ])
-  })
-
-  return t
+  return getChange(date, mod, -1)
 }
 
 export function startOfDate (date, unit, utc) {

package/src/utils/private/create.js

@@ -0,0 +1,4 @@
+import { defineComponent, markRaw } from 'vue'
+
+export const createComponent = raw => markRaw(defineComponent(raw))
+export const createDirective = raw => markRaw(raw)