@dimailn/vuetify 2.7.2-alpha40 → 2.7.2-alpha42

package/src/mixins/overlayable/__tests__/overlayable.spec.ts

@@ -12,9 +12,9 @@ describe('Overlayable.ts', () => {
   const Mock = defineComponent({
     mixins: [Overlayable],
     data: () => ({
-      isActive: false,
+      isActive: false
     }),
-    render: () => h('div'),
+    render: () => h('div')
   })
 
   beforeEach(() => {
@@ -29,10 +29,10 @@ describe('Overlayable.ts', () => {
       return mount(Mock, {
         global: {
           mocks: {
-            $vuetify: { breakpoint: {} },
-          },
+            $vuetify: { breakpoint: {} }
+          }
         },
-        ...options,
+        ...options
       })
     }
   })
@@ -94,9 +94,9 @@ describe('Overlayable.ts', () => {
     const wrapper = mountFunction({
       global: {
         mocks: {
-          $vuetify: { breakpoint: {} },
-        },
-      },
+          $vuetify: { breakpoint: {} }
+        }
+      }
     })
 
     // Mock the methods

package/src/mixins/overlayable/index.ts

@@ -7,7 +7,7 @@ import {
   addOnceEventListener,
   addPassiveEventListener,
   getZIndex,
-  composedPath,
+  composedPath
 } from '../../util/helpers'
 
 // Types
@@ -36,13 +36,13 @@ export default defineComponent({
   props: {
     hideOverlay: Boolean,
     overlayColor: String,
-    overlayOpacity: [Number, String],
+    overlayOpacity: [Number, String]
   },
 
   data () {
     return {
       animationFrame: 0,
-      overlay: null as InstanceType<typeof VOverlay> | null,
+      overlay: null as InstanceType<typeof VOverlay> | null
     }
   },
 
@@ -52,7 +52,7 @@ export default defineComponent({
 
       if (value) this.removeOverlay()
       else this.genOverlay()
-    },
+    }
   },
 
   beforeUnmount () {
@@ -62,7 +62,7 @@ export default defineComponent({
   methods: {
     createOverlay () {
       // Create a container element
-      const container = document.createElement('div');
+      const container = document.createElement('div')
 
       const props = {
         absolute: this.absolute,
@@ -70,10 +70,10 @@ export default defineComponent({
         opacity: this.overlayOpacity
       }
       const wrapper = {
-        data() {
+        data () {
           return { value: false, zIndex: undefined }
         },
-        render() {
+        render () {
           return h(VOverlay, {
             modelValue: this.value,
             zIndex: this.zIndex,
@@ -92,18 +92,18 @@ export default defineComponent({
       const overlayApp = createApp(wrapper)
 
       // Mount the app to the container
-      const overlayInstance = overlayApp.mount(container);
+      const overlayInstance = overlayApp.mount(container)
 
       // Determine the parent element
       const parent = this.absolute
         ? this.$el.parentNode
-        : document.querySelector('[data-app]');
+        : document.querySelector('[data-app]')
 
       if (parent) {
-        parent.insertBefore(container, parent.firstChild);
+        parent.insertBefore(container, parent.firstChild)
       }
 
-      this.overlay = overlayInstance;
+      this.overlay = overlayInstance
       this.overlayApp = overlayApp
     },
     genOverlay () {
@@ -166,9 +166,9 @@ export default defineComponent({
         const up = [keyCodes.up, keyCodes.pageup]
         const down = [keyCodes.down, keyCodes.pagedown]
 
-        if (up.includes(e.keyCode)) {
+        if (up.includes(e.keyCode as typeof keyCodes.up | typeof keyCodes.pageup)) {
           (e as any).deltaY = -1
-        } else if (down.includes(e.keyCode)) {
+        } else if (down.includes(e.keyCode as typeof keyCodes.down | typeof keyCodes.pagedown)) {
           (e as any).deltaY = 1
         } else {
           return
@@ -259,6 +259,6 @@ export default defineComponent({
       document.documentElement!.classList.remove('overflow-y-hidden')
       window.removeEventListener('wheel', this.scrollListener)
       window.removeEventListener('keydown', this.scrollListener)
-    },
-  },
+    }
+  }
 })

package/src/mixins/picker/index.ts

@@ -29,8 +29,8 @@ export default mixins(
     noTitle: Boolean,
     width: {
       type: [Number, String],
-      default: 290,
-    },
+      default: 290
+    }
   },
 
   methods: {
@@ -41,10 +41,12 @@ export default mixins(
       return null
     },
     genPickerActionsSlot () {
-      return this.$slots.default ? this.$slots.default({
-        save: (this as any).save,
-        cancel: (this as any).cancel,
-      }) : getSlot(this)
+      return this.$slots.default
+        ? this.$slots.default({
+          save: (this as any).save,
+          cancel: (this as any).cancel
+        })
+        : getSlot(this)
     },
     genPicker (staticClass: string) {
       const children: Record<string, any> = {}
@@ -71,6 +73,6 @@ export default mixins(
         width: this.width,
         noTitle: this.noTitle
       }, children)
-    },
-  },
+    }
+  }
 })

package/src/mixins/picker-button/index.ts

@@ -6,7 +6,8 @@ import mixins from '../../util/mixins'
 import { kebabCase } from '../../util/helpers'
 
 // Types
-import { VNodeChildren, h } from 'vue'
+import type { VNodeChildren } from '../../types/vue-internal'
+import { h } from 'vue'
 
 /* @vue/component */
 export default mixins(
@@ -29,10 +30,10 @@ export default mixins(
       return h('div', {
         class: [`v-picker__title__btn ${staticClass}`.trim(), {
           'v-picker__title__btn--active': active,
-          'v-picker__title__btn--readonly': readonly,
+          'v-picker__title__btn--readonly': readonly
         }],
-        ...((active || readonly) ? {} : { onClick }),
+        ...((active || readonly) ? {} : { onClick })
       }, Array.isArray(content) ? content : [content])
-    },
-  },
+    }
+  }
 })

package/src/mixins/positionable/index.ts

@@ -1,6 +1,6 @@
-import {defineComponent} from 'vue'
+import { defineComponent } from 'vue'
+import type { Component } from 'vue'
 import { filterObjectOnKeys } from '../../util/helpers'
-import { OptionsVue, Component } from 'vue/types/vue'
 
 const availableProps = {
   absolute: Boolean,
@@ -8,18 +8,18 @@ const availableProps = {
   fixed: Boolean,
   left: Boolean,
   right: Boolean,
-  top: Boolean,
+  top: Boolean
 }
 type props = Record<keyof typeof availableProps, boolean>
 
-export type Positionable<S extends keyof props> = Component<Vue & { [P in S]: boolean }, { [P in S]: BooleanConstructor }>
+export type Positionable<S extends keyof props> = Component
 
 export function factory <S extends keyof props> (selected?: S[]): Positionable<S>
-export function factory (selected: undefined): OptionsVue<Vue, {}, {}, {}, props, typeof availableProps>
+export function factory (selected: undefined): Component
 export function factory (selected: any[] = []): any {
   return defineComponent({
     name: 'positionable',
-    props: selected.length ? filterObjectOnKeys(availableProps, selected) : availableProps,
+    props: selected.length ? filterObjectOnKeys(availableProps, selected) : availableProps
   })
 }
 

package/src/mixins/proxyable/__tests__/proxyable.spec.ts

@@ -3,7 +3,7 @@ import {
   mount,
   MountOptions,
   Wrapper,
-  enableAutoUnmount,
+  enableAutoUnmount
 } from '@vue/test-utils'
 
 describe('proxyable.ts', () => {
@@ -11,7 +11,7 @@ describe('proxyable.ts', () => {
 
   const Mock = {
     mixins: [Proxyable],
-    template: '<div></div>',
+    template: '<div></div>'
   }
 
   type Instance = InstanceType<typeof Mock>
@@ -25,7 +25,7 @@ describe('proxyable.ts', () => {
 
   it('should watch prop and emit event', async () => {
     const wrapper = mountFunction({
-      props: { modelValue: 'foo' },
+      props: { modelValue: 'foo' }
     })
 
     expect(wrapper.vm.internalValue).toBe('foo')
@@ -48,11 +48,11 @@ describe('proxyable.ts', () => {
   it('should use provided prop and event arguments', async () => {
     const wrapper = mount({
       mixins: [Proxy('input', 'update:input-value')],
-      template: '<div></div>',
+      template: '<div></div>'
     }, {
       props: {
-        input: 'foo',
-      },
+        input: 'foo'
+      }
     })
 
     expect(wrapper.vm.input).toBe('foo')

package/src/mixins/proxyable/index.ts

@@ -15,13 +15,13 @@ export function factory (
 
     props: {
       [prop]: {
-        required: false,
-      },
+        required: false
+      }
     },
 
     data () {
       return {
-        internalLazyValue: this[prop] as unknown,
+        internalLazyValue: this[prop] as unknown
       }
     },
 
@@ -37,17 +37,17 @@ export function factory (
 
           // Don't emit events if component is being destroyed
           if (!this.$.isUnmounted) {
-            this.$emit(event, val);
+            this.$emit(event, val)
           }
-        },
-      },
+        }
+      }
     },
 
     watch: {
       [prop] (val) {
         this.internalLazyValue = val
-      },
-    },
+      }
+    }
   })
 }
 

package/src/mixins/registrable/__tests__/registrable.spec.ts

@@ -2,7 +2,7 @@ import { inject as RegistrableInject, provide as RegistrableProvide } from '../'
 import {
   mount,
   MountingOptions,
-  VueWrapper,
+  VueWrapper
 } from '@vue/test-utils'
 import { defineComponent } from 'vue'
 
@@ -10,7 +10,7 @@ describe('registrable.ts', () => {
   it('should inject registrable', () => {
     const Mock = defineComponent({
       extends: RegistrableInject('test'),
-      render: () => null,
+      render: () => null
     })
 
     const wrapper = mount(Mock)
@@ -21,7 +21,7 @@ describe('registrable.ts', () => {
   it('should provide registrable', () => {
     const Mock = defineComponent({
       mixins: [RegistrableProvide('test')],
-      render: () => null,
+      render: () => null
     })
 
     const wrapper = mount(Mock)

package/src/mixins/registrable/index.ts

@@ -1,34 +1,31 @@
-import {defineComponent} from 'vue'
-import { Component } from 'vue/types/vue'
+import { defineComponent } from 'vue'
+import type { Component } from 'vue'
 import { consoleWarn } from '../../util/console'
 
 function generateWarning (child: string, parent: string) {
   return () => consoleWarn(`The ${child} component must be used inside a ${parent}`)
 }
 
-export type Registrable<T extends string, C extends Component | null = null> = Component<Vue & {
-  [K in T]: C extends Component ? InstanceType<C> : {
-    register (...props: any[]): void
-    unregister (self: any): void
-  }
-}>
+export type Registrable<T extends string, C extends Component | null = null> = Component
 
 export function inject<
   T extends string, C extends Component | null = null
 > (namespace: T, child?: string, parent?: string): Registrable<T, C> {
-  const defaultImpl = child && parent ? {
-    register: generateWarning(child, parent),
-    unregister: generateWarning(child, parent),
-  } : null
+  const defaultImpl = child && parent
+    ? {
+        register: generateWarning(child, parent),
+        unregister: generateWarning(child, parent)
+      }
+    : null
 
   return defineComponent({
     name: 'registrable-inject',
 
     inject: {
       [namespace]: {
-        default: defaultImpl,
-      },
-    },
+        default: defaultImpl
+      }
+    }
   })
 }
 
@@ -38,11 +35,13 @@ export function provide (namespace: string, self = false) {
 
     provide (): object {
       return {
-        [namespace]: self ? this : {
-          register: (this as any).register,
-          unregister: (this as any).unregister,
-        },
+        [namespace]: self
+          ? this
+          : {
+              register: (this as any).register,
+              unregister: (this as any).unregister
+            }
       }
-    },
+    }
   })
 }

package/src/mixins/returnable/index.ts

@@ -1,16 +1,16 @@
-import {defineComponent} from 'vue'
+import { defineComponent } from 'vue'
 
 /* @vue/component */
 export default defineComponent({
   name: 'returnable',
 
   props: {
-    returnValue: null as any,
+    returnValue: null as any
   },
 
   data: () => ({
     isActive: false,
-    originalValue: null as any,
+    originalValue: null as any
   }),
 
   watch: {
@@ -20,7 +20,7 @@ export default defineComponent({
       } else {
         this.$emit('update:return-value', this.originalValue)
       }
-    },
+    }
   },
 
   methods: {
@@ -29,6 +29,6 @@ export default defineComponent({
       setTimeout(() => {
         this.isActive = false
       })
-    },
-  },
+    }
+  }
 })

package/src/mixins/rippleable/__tests__/rippleable.spec.ts

@@ -7,7 +7,7 @@ describe('rippleable.ts', () => {
     extends: Rippleable,
     render () {
       return this.genRipple()
-    },
+    }
   })
 
   type Instance = InstanceType<typeof Mock>;

package/src/mixins/rippleable/index.ts

@@ -2,7 +2,8 @@
 import ripple from '../../directives/ripple'
 
 // Types
-import Vue, { VNode, VNodeData, VNodeDirective, defineComponent, withDirectives, h } from 'vue'
+import { VNode, defineComponent, withDirectives, h } from 'vue'
+import type { VNodeData, VNodeDirective } from '../../types/vue-internal'
 
 export default defineComponent({
   name: 'rippleable',
@@ -12,8 +13,8 @@ export default defineComponent({
   props: {
     ripple: {
       type: [Boolean, Object],
-      default: true,
-    },
+      default: true
+    }
   },
 
   methods: {
@@ -36,6 +37,6 @@ export default defineComponent({
           {}
         ]
       ])
-    },
-  },
+    }
+  }
 })

package/src/mixins/roundable/__tests__/roundable.spec.ts

@@ -3,7 +3,7 @@ import Roundable from '../'
 import {
   mount,
   MountOptions,
-  Wrapper,
+  Wrapper
 } from '@vue/test-utils'
 
 describe('roundable.ts', () => {
@@ -11,9 +11,9 @@ describe('roundable.ts', () => {
     mixins: [Roundable],
     render () {
       return h('div', {
-        class: this.roundedClasses,
+        class: this.roundedClasses
       })
-    },
+    }
   })
 
   type Instance = InstanceType<typeof Mock>
@@ -31,7 +31,7 @@ describe('roundable.ts', () => {
     [{ rounded: '0' }, { 'rounded-0': true }],
     [{ rounded: true }, { rounded: true }],
     [{ rounded: false }, {}],
-    [{ rounded: 'tr-xl br-lg' }, { 'rounded-tr-xl rounded-br-lg': true }],
+    [{ rounded: 'tr-xl br-lg' }, { 'rounded-tr-xl rounded-br-lg': true }]
   ])('should return correct rounded classes', (propsData, expected: any) => {
     const wrapper = mountFunction({ props: propsData })
 

package/src/mixins/roundable/index.ts

@@ -1,4 +1,4 @@
-import {defineComponent} from 'vue'
+import { defineComponent } from 'vue'
 
 /* @vue/component */
 export default defineComponent({
@@ -6,7 +6,7 @@ export default defineComponent({
 
   props: {
     rounded: [Boolean, String],
-    tile: Boolean,
+    tile: Boolean
   },
 
   computed: {
@@ -28,9 +28,11 @@ export default defineComponent({
         composite.push('rounded')
       }
 
-      return composite.length > 0 ? {
-        [composite.join(' ')]: true,
-      } : {}
-    },
-  },
+      return composite.length > 0
+        ? {
+            [composite.join(' ')]: true
+          }
+        : {}
+    }
+  }
 })

package/src/mixins/routable/__tests__/routable.spec.ts

@@ -12,8 +12,8 @@ describe('routable.ts', () => {
       history: createWebHistory(),
       routes: [
         { path: '/', component: { template: '<div>Home</div>' } },
-        { path: '/foo', component: { template: '<div>Foo</div>' } },
-      ],
+        { path: '/foo', component: { template: '<div>Foo</div>' } }
+      ]
     })
 
     mountFunction = (options = {}) => {
@@ -21,18 +21,18 @@ describe('routable.ts', () => {
         mixins: [Routable],
         props: {
           activeClass: {
-            default: 'active',
+            default: 'active'
           },
           exactActiveClass: {
-            default: 'exact-active',
-          },
+            default: 'exact-active'
+          }
         },
-        template: '<div ref="link" :class="classes"></div>',
+        template: '<div ref="link" :class="classes"></div>'
       }, {
         global: {
-          plugins: [router],
+          plugins: [router]
         },
-        ...options,
+        ...options
       })
     }
   })
@@ -40,8 +40,8 @@ describe('routable.ts', () => {
   it('should have correct computed properties', async () => {
     const wrapper = mountFunction({
       props: {
-        to: '/',
-      },
+        to: '/'
+      }
     })
 
     expect(wrapper.vm.isLink).toBeTruthy() // isLink returns the 'to' value, which is truthy
@@ -52,8 +52,8 @@ describe('routable.ts', () => {
     const wrapper = mountFunction({
       props: {
         to: '/',
-        activeClass: 'custom-active',
-      },
+        activeClass: 'custom-active'
+      }
     })
 
     expect(wrapper.vm.classes).toBeDefined()
@@ -63,8 +63,8 @@ describe('routable.ts', () => {
     const wrapper = mountFunction({
       props: {
         to: '/',
-        disabled: true,
-      },
+        disabled: true
+      }
     })
 
     expect(wrapper.vm.isClickable).toBe(false)
@@ -74,8 +74,8 @@ describe('routable.ts', () => {
     const wrapper = mountFunction({
       props: {
         to: '/',
-        notALink: true,
-      },
+        notALink: true
+      }
     })
 
     expect(wrapper.vm.isClickable).toBe(false)
@@ -84,8 +84,8 @@ describe('routable.ts', () => {
   it('should handle href prop', async () => {
     const wrapper = mountFunction({
       props: {
-        href: 'https://example.com',
-      },
+        href: 'https://example.com'
+      }
     })
 
     expect(wrapper.vm.isLink).toBe('https://example.com')
@@ -95,8 +95,8 @@ describe('routable.ts', () => {
   it('should handle link prop', async () => {
     const wrapper = mountFunction({
       props: {
-        link: true,
-      },
+        link: true
+      }
     })
 
     expect(wrapper.vm.isLink).toBe(true)