@dimailn/vuetify 2.7.2-alpha40 → 2.7.2-alpha42

package/src/components/VDatePicker/mixins/date-picker-table.ts

@@ -17,21 +17,16 @@ import { throttle } from '../../../util/helpers'
 import { breaking } from '../../../util/console'
 
 // Types
-import {
-  PropType,
-  VNodeChildren,
-  Transition,
-  withDirectives,
-  h,
-} from 'vue'
-import { PropValidator } from 'vue/types/options'
+import type { PropType } from 'vue'
+import { Transition, withDirectives, h } from 'vue'
+import type { VNodeChildren } from '../../../types/vue-internal'
 import {
   DatePickerAllowedDatesFunction,
   DatePickerEventColors,
   DatePickerEventColorValue,
   DatePickerEvents,
   DatePickerFormatter,
-  TouchWrapper,
+  TouchWrapper
 } from 'vuetify/types'
 
 type CalculateTableDateFunction = (v: number) => string
@@ -50,12 +45,12 @@ export default mixins(
     format: Function as PropType<DatePickerFormatter | undefined>,
     events: {
       type: [Array, Function, Object],
-      default: () => null,
-    } as PropValidator<DatePickerEvents | null>,
+      default: () => null
+    } as unknown as PropType<DatePickerEvents | null>,
     eventColor: {
       type: [Array, Function, Object, String],
-      default: () => 'warning',
-    } as PropValidator<DatePickerEventColors>,
+      default: () => 'warning'
+    } as unknown as PropType<DatePickerEventColors>,
     min: String,
     max: String,
     range: Boolean,
@@ -63,14 +58,14 @@ export default mixins(
     scrollable: Boolean,
     tableDate: {
       type: String,
-      required: true,
+      required: true
     },
-    modelValue: [String, Array] as PropType<string | string[]>,
+    modelValue: [String, Array] as PropType<string | string[]>
   },
 
   data: () => ({
     isReversing: false,
-    wheelThrottle: null as any,
+    wheelThrottle: null as any
   }),
 
   computed: {
@@ -86,13 +81,19 @@ export default mixins(
     // Vue 3 compatibility: use modelValue
     currentValue (): string | string[] | undefined {
       return this.modelValue
-    },
+    }
+  },
+
+  watch: {
+    tableDate (newVal: string, oldVal: string) {
+      this.isReversing = newVal < oldVal
+    }
   },
 
   created () {
     const breakingProps = [
       ['value', 'modelValue'],
-      ['onInput', 'onUpdate:modelValue'],
+      ['onInput', 'onUpdate:modelValue']
     ]
 
     /* istanbul ignore next */
@@ -101,12 +102,6 @@ export default mixins(
     })
   },
 
-  watch: {
-    tableDate (newVal: string, oldVal: string) {
-      this.isReversing = newVal < oldVal
-    },
-  },
-
   mounted () {
     this.wheelThrottle = throttle(this.wheel, 250)
   },
@@ -118,7 +113,7 @@ export default mixins(
       isSelected: boolean,
       isCurrent: boolean,
       isFirst: boolean,
-      isLast: boolean,
+      isLast: boolean
     ) {
       return {
         'v-size--default': !isFloating,
@@ -131,7 +126,7 @@ export default mixins(
         'v-btn--outlined': isCurrent && !isSelected,
         'v-date-picker--first-in-range': isFirst,
         'v-date-picker--last-in-range': isLast,
-        ...this.themeClasses,
+        ...this.themeClasses
       }
     },
     genButtonEvents (value: string, isAllowed: boolean, mouseEventType: string) {
@@ -142,7 +137,7 @@ export default mixins(
           if (isAllowed && !this.readonly) {
             this.$emit('update:modelValue', value)
           }
-        },
+        }
       }, createItemTypeNativeListeners(this, mouseEventType, value))
     },
     genButton (value: string, isFloating: boolean, mouseEventType: string, formatter: DatePickerFormatter, isOtherMonth = false) {
@@ -165,16 +160,16 @@ export default mixins(
           isSelected,
           isCurrent,
           isFirst,
-          isLast,
+          isLast
         )],
         type: 'button',
         disabled: this.disabled || !isAllowed || isOtherMonth,
-        ...this.genButtonEvents(value, isAllowed, mouseEventType),
+        ...this.genButtonEvents(value, isAllowed, mouseEventType)
       }), [
         h('div', {
-          class: 'v-btn__content',
+          class: 'v-btn__content'
         }, [formatter(value)]),
-        this.genEvents(value),
+        this.genEvents(value)
       ])
     },
     getEventColors (date: string) {
@@ -211,9 +206,11 @@ export default mixins(
     genEvents (date: string) {
       const eventColors = this.getEventColors(date)
 
-      return eventColors.length ? h('div', {
-        class: 'v-date-picker-table__events',
-      }, eventColors.map(color => h('div', this.setBackgroundColor(color)))) : null
+      return eventColors.length
+        ? h('div', {
+          class: 'v-date-picker-table__events'
+        }, eventColors.map(color => h('div', this.setBackgroundColor(color))))
+        : null
     },
     isValidScroll (value: number, calculateTableDate: CalculateTableDateFunction) {
       const tableDate = calculateTableDate(value)
@@ -230,8 +227,8 @@ export default mixins(
     },
     genTable (staticClass: string, children: VNodeChildren, calculateTableDate: CalculateTableDateFunction) {
       const transition = h(Transition, {
-        name: this.computedTransition,
-      }, () => [h('table', { key: this.tableDate }, children)])
+        name: this.computedTransition
+      }, () => [h('table', { key: this.tableDate }, children as any)])
 
       const touchDirective = [
         Touch,
@@ -239,23 +236,25 @@ export default mixins(
           left: (e: TouchWrapper) => (e.offsetX < -15) &&
             (this.isValidScroll(1, calculateTableDate) && this.touch(1, calculateTableDate)),
           right: (e: TouchWrapper) => (e.offsetX > 15) &&
-            (this.isValidScroll(-1, calculateTableDate) && this.touch(-1, calculateTableDate)),
-        },
+            (this.isValidScroll(-1, calculateTableDate) && this.touch(-1, calculateTableDate))
+        }
       ]
 
       return withDirectives(h('div', {
         class: {
           [staticClass]: true,
           'v-date-picker-table--disabled': this.disabled,
-          ...this.themeClasses,
+          ...this.themeClasses
         },
-        ...((!this.disabled && this.scrollable) ? {
-          onWheel: (e: WheelEvent) => {
-            e.preventDefault()
-            if (this.isValidScroll(e.deltaY, calculateTableDate)) { this.wheelThrottle(e, calculateTableDate) }
-          },
-        } : {}),
-      }, [transition]), [touchDirective])
+        ...((!this.disabled && this.scrollable)
+          ? {
+              onWheel: (e: WheelEvent) => {
+                e.preventDefault()
+                if (this.isValidScroll(e.deltaY, calculateTableDate)) { this.wheelThrottle(e, calculateTableDate) }
+              }
+            }
+          : {})
+      }, [transition]), [touchDirective] as any)
     },
     isSelected (value: string): boolean {
       if (Array.isArray(this.currentValue)) {
@@ -268,6 +267,6 @@ export default mixins(
       }
 
       return value === this.currentValue
-    },
-  },
+    }
+  }
 })

package/src/components/VDatePicker/util/eventHelpers.ts

@@ -5,7 +5,7 @@ export function createItemTypeListeners (instance: any, itemTypeSuffix: string)
 
   const eventAttrs = [
     `onClick${itemTypeSuffix}`,
-    `onDblclick${itemTypeSuffix}`,
+    `onDblclick${itemTypeSuffix}`
   ]
 
   eventAttrs.forEach(attrName => {
@@ -23,7 +23,7 @@ export function createItemTypeNativeListeners (instance: any, mouseEventType: st
 
   const eventAttrs = [
     `onClick${mouseEventType.charAt(0).toUpperCase() + mouseEventType.slice(1)}`,
-    `onDblclick${mouseEventType.charAt(0).toUpperCase() + mouseEventType.slice(1)}`,
+    `onDblclick${mouseEventType.charAt(0).toUpperCase() + mouseEventType.slice(1)}`
   ]
 
   eventAttrs.forEach(attrName => {

package/src/components/VDatePicker/util/index.ts

@@ -1,6 +1,6 @@
 import {
   createItemTypeListeners,
-  createItemTypeNativeListeners,
+  createItemTypeNativeListeners
 } from './eventHelpers'
 import createNativeLocaleFormatter from './createNativeLocaleFormatter'
 import monthChange from './monthChange'
@@ -13,5 +13,5 @@ export {
   createNativeLocaleFormatter,
   monthChange,
   sanitizeDateString,
-  pad,
+  pad
 }

package/src/components/VDialog/VDialog.ts

@@ -21,11 +21,11 @@ import mixins from '../../util/mixins'
 import { removed, breaking } from '../../util/console'
 import {
   convertToUnit,
-  keyCodes,
+  keyCodes
 } from '../../util/helpers'
 
 // Types
-import { VNode, VNodeData } from 'vue'
+import type { VNode, VNodeData } from '../../types/vue-internal'
 
 const baseMixins = mixins(
   Dependent,
@@ -33,7 +33,7 @@ const baseMixins = mixins(
   Overlayable,
   Returnable,
   Stackable,
-  Activatable,
+  Activatable
 )
 
 /* @vue/component */
@@ -49,19 +49,19 @@ export default baseMixins.extend({
     noClickAnimation: Boolean,
     origin: {
       type: String,
-      default: 'center center',
+      default: 'center center'
     },
     persistent: Boolean,
     retainFocus: {
       type: Boolean,
-      default: true,
+      default: true
     },
     scrollable: Boolean,
     transition: {
       type: [String, Boolean],
-      default: 'dialog-transition',
+      default: 'dialog-transition'
     },
-    width: [String, Number],
+    width: [String, Number]
   },
 
   emits: ['click:outside', 'keydown', 'update:return-value', 'update:modelValue'],
@@ -72,7 +72,7 @@ export default baseMixins.extend({
       animate: false,
       animateTimeout: -1,
       stackMinZIndex: 200,
-      previousActiveElement: null as HTMLElement | null,
+      previousActiveElement: null as HTMLElement | null
     }
   },
 
@@ -84,21 +84,18 @@ export default baseMixins.extend({
         'v-dialog--persistent': this.persistent,
         'v-dialog--fullscreen': this.fullscreen,
         'v-dialog--scrollable': this.scrollable,
-        'v-dialog--animated': this.animate,
+        'v-dialog--animated': this.animate
       }
     },
     contentClasses (): object {
       return {
         'v-dialog__content': true,
-        'v-dialog__content--active': this.isActive,
+        'v-dialog__content--active': this.isActive
       }
     },
     hasActivator (): boolean {
-      return Boolean(
-        !!this.$slots.activator ||
-        !!this.$slots.activator
-      )
-    },
+      return Boolean(this.$slots.activator)
+    }
   },
 
   watch: {
@@ -122,13 +119,13 @@ export default baseMixins.extend({
         this.showScroll()
         this.genOverlay()
       }
-    },
+    }
   },
 
   created () {
     const breakingProps = [
       ['value', 'modelValue'],
-      ['onInput', 'onUpdate:modelValue'],
+      ['onInput', 'onUpdate:modelValue']
     ]
 
     /* istanbul ignore next */
@@ -255,7 +252,7 @@ export default baseMixins.extend({
         h(VThemeProvider, {
           root: true,
           light: this.light,
-          dark: this.dark,
+          dark: this.dark
         }, () => [
           h('div', {
             class: this.contentClasses,
@@ -264,9 +261,9 @@ export default baseMixins.extend({
             ...this.getScopeIdAttrs(),
             onKeydown: this.onKeydown,
             style: { zIndex: this.activeZIndex },
-            ref: 'content',
-          }, [this.genTransition()]),
-        ]),
+            ref: 'content'
+          }, [this.genTransition()])
+        ])
       ])
     },
     genTransition () {
@@ -277,7 +274,7 @@ export default baseMixins.extend({
       return h(Transition, {
         name: this.transition,
         origin: this.origin,
-        appear: true,
+        appear: true
       }, () => [content])
     },
     genInnerContent () {
@@ -287,36 +284,36 @@ export default baseMixins.extend({
           {
             handler: this.onClickOutside,
             closeConditional: this.closeConditional,
-            include: this.getOpenDependentElements,
-          },
+            include: this.getOpenDependentElements
+          }
         ],
         [
           vShow,
-          this.isActive,
-        ],
+          this.isActive
+        ]
       ]
       const data: VNodeData = {
         class: this.classes,
         tabindex: this.isActive ? 0 : undefined,
         ref: 'dialog',
         style: {
-          transformOrigin: this.origin,
-        },
+          transformOrigin: this.origin
+        }
       }
 
       if (!this.fullscreen) {
         data.style = {
           ...data.style as object,
           maxWidth: convertToUnit(this.maxWidth),
-          width: convertToUnit(this.width),
+          width: convertToUnit(this.width)
         }
       }
 
       return withDirectives(
         h('div', data, this.getContentSlot()),
-        directives
+        directives as any
       )
-    },
+    }
   },
 
   render (): VNode {
@@ -325,11 +322,11 @@ export default baseMixins.extend({
         'v-dialog__container--attached':
           this.attach === '' ||
           this.attach === true ||
-          this.attach === 'attach',
-      }],
+          this.attach === 'attach'
+      }]
     }, [
       this.genActivator(),
-      this.genContent(),
+      this.genContent()
     ])
-  },
+  }
 })