@dimailn/vuetify 2.7.2-alpha40 → 2.7.2-alpha42

package/src/components/VTreeview/__tests__/VTreeviewNode.spec.ts

@@ -3,7 +3,7 @@ import {
   mount,
   VueWrapper,
   MountingOptions,
-  enableAutoUnmount,
+  enableAutoUnmount
 } from '@vue/test-utils'
 import { h, defineComponent } from 'vue'
 
@@ -19,9 +19,9 @@ const Mock = defineComponent({
 
   render () {
     return h(VTreeviewNode, {
-      item: singleRootTwoChildren,
+      item: singleRootTwoChildren
     })
-  },
+  }
 })
 
 describe('VTreeViewNode.ts', () => {
@@ -39,7 +39,7 @@ describe('VTreeViewNode.ts', () => {
       updateActive: () => {},
       emitActive: () => {},
       updateOpen: () => {},
-      emitOpen: () => {},
+      emitOpen: () => {}
     }
 
     mountFunction = (options = {}) => {
@@ -49,14 +49,14 @@ describe('VTreeViewNode.ts', () => {
             $vuetify: {
               icons: {
                 values: {
-                  subgroup: 'arrow_drop_down',
-                },
-              },
-            },
+                  subgroup: 'arrow_drop_down'
+                }
+              }
+            }
           },
-          provide: { treeview },
+          provide: { treeview }
         },
-        ...options,
+        ...options
       })
     }
   })
@@ -75,15 +75,15 @@ describe('VTreeViewNode.ts', () => {
   it('should use scoped slots', () => {
     const wrapper = mount(VTreeviewNode, {
       props: {
-        item: singleRootTwoChildren,
+        item: singleRootTwoChildren
       },
       slots: {
         prepend: defaultSlot,
-        append: defaultSlot,
+        append: defaultSlot
       },
       global: {
-        provide: { treeview },
-      },
+        provide: { treeview }
+      }
     })
 
     expect(wrapper.html()).toMatchSnapshot()
@@ -91,7 +91,7 @@ describe('VTreeViewNode.ts', () => {
 
   it('should generate a transition element', () => {
     const wrapper = mountFunction({
-      props: { transition: true },
+      props: { transition: true }
     })
 
     expect(wrapper.html()).toMatchSnapshot()
@@ -100,14 +100,14 @@ describe('VTreeViewNode.ts', () => {
   it('should use label slot', () => {
     const wrapper = mount(VTreeviewNode, {
       props: {
-        item: singleRootTwoChildren,
+        item: singleRootTwoChildren
       },
       slots: {
-        label: (props: any) => h('div', [props.item.name.toUpperCase()]),
+        label: (props: any) => h('div', [props.item.name.toUpperCase()])
       },
       global: {
-        provide: { treeview },
-      },
+        provide: { treeview }
+      }
     })
 
     expect(wrapper.html()).toMatchSnapshot()
@@ -116,15 +116,15 @@ describe('VTreeViewNode.ts', () => {
   it('should render disabled item', () => {
     const wrapper = mount(VTreeviewNode, {
       props: {
-        item: { ...singleRootTwoChildren, disabled: true },
+        item: { ...singleRootTwoChildren, disabled: true }
       },
       slots: {
         prepend: defaultSlot,
-        append: defaultSlot,
+        append: defaultSlot
       },
       global: {
-        provide: { treeview },
-      },
+        provide: { treeview }
+      }
     })
 
     expect(wrapper.html()).toMatchSnapshot()
@@ -136,8 +136,8 @@ describe('VTreeViewNode.ts', () => {
       props: {
         item: singleRootWithEmptyChildrens,
         activatable: true,
-        openOnClick: true,
-      },
+        openOnClick: true
+      }
     })
 
     expect(wrapper.vm.isActive).toBe(false)
@@ -154,8 +154,8 @@ describe('VTreeViewNode.ts', () => {
         item: singleRootWithEmptyChildrens,
         activatable: true,
         openOnClick: true,
-        loadChildren: () => {},
-      },
+        loadChildren: () => {}
+      }
     })
 
     expect(wrapper.vm.isActive).toBe(false)
@@ -171,8 +171,8 @@ describe('VTreeViewNode.ts', () => {
       props: {
         item: { ...singleRootWithEmptyChildrens, disabled: true },
         activatable: true,
-        openOnClick: true,
-      },
+        openOnClick: true
+      }
     })
 
     expect(wrapper.vm.isActive).toBe(false)

package/src/components/VTreeview/index.ts

@@ -6,6 +6,6 @@ export { VTreeview, VTreeviewNode }
 export default {
   $_vuetify_subcomponents: {
     VTreeview,
-    VTreeviewNode,
-  },
+    VTreeviewNode
+  }
 }

package/src/components/VVirtualScroll/VVirtualScroll.ts

@@ -1,4 +1,4 @@
-import {h, withDirectives} from 'vue'
+import { h, withDirectives } from 'vue'
 // Styles
 import './VVirtualScroll.sass'
 
@@ -11,7 +11,7 @@ import Scroll from '../../directives/scroll'
 // Utilities
 import {
   convertToUnit,
-  getSlot,
+  getSlot
 } from '../../util/helpers'
 
 // Types
@@ -25,22 +25,22 @@ export default defineComponent({
   props: {
     bench: {
       type: [Number, String],
-      default: 0,
+      default: 0
     },
     itemHeight: {
       type: [Number, String],
-      required: true,
+      required: true
     },
     items: {
       type: Array,
-      default: () => [],
-    },
+      default: () => []
+    }
   },
 
   data: () => ({
     first: 0,
     last: 0,
-    scrollTop: 0,
+    scrollTop: 0
   }),
 
   computed: {
@@ -55,12 +55,12 @@ export default defineComponent({
     },
     lastToRender (): number {
       return Math.min(this.items.length, this.last + this.__bench)
-    },
+    }
   },
 
   watch: {
     height: 'onScroll',
-    itemHeight: 'onScroll',
+    itemHeight: 'onScroll'
   },
 
   mounted () {
@@ -71,7 +71,7 @@ export default defineComponent({
     getChildren (): VNode[] {
       return this.items.slice(
         this.firstToRender,
-        this.lastToRender,
+        this.lastToRender
       ).map(this.genChild)
     },
     genChild (item: any, index: number) {
@@ -82,7 +82,7 @@ export default defineComponent({
       return h('div', {
         class: 'v-virtual-scroll__item',
         style: { top },
-        key: index,
+        key: index
       }, getSlot(this, 'default', { index, item }))
     },
     getFirst (): number {
@@ -97,22 +97,22 @@ export default defineComponent({
       this.scrollTop = this.$el.scrollTop
       this.first = this.getFirst()
       this.last = this.getLast(this.first)
-    },
+    }
   },
 
   render (): VNode {
     const content = h('div', {
       class: 'v-virtual-scroll__container',
       style: {
-        height: convertToUnit((this.items.length * this.__itemHeight)),
-      },
+        height: convertToUnit((this.items.length * this.__itemHeight))
+      }
     }, this.getChildren())
 
     return withDirectives(
       h('div', {
         class: 'v-virtual-scroll',
         style: this.measurableStyles,
-        ...(this as any).$listeners,
+        ...(this as any).$listeners
       }, {
         default: () => [content]
       }),
@@ -120,5 +120,5 @@ export default defineComponent({
         [Scroll, this.onScroll, '', { self: true }]
       ]
     )
-  },
+  }
 })

package/src/components/VVirtualScroll/__tests__/VVirtualScroll.spec.ts

@@ -6,7 +6,7 @@ import {
   mount,
   VueWrapper,
   MountingOptions,
-  enableAutoUnmount,
+  enableAutoUnmount
 } from '@vue/test-utils'
 import { h, nextTick } from 'vue'
 
@@ -24,14 +24,14 @@ describe('VVirtualScroll.ts', () => {
       return mount(VVirtualScroll, {
         ...options,
         slots: {
-          default: ({ item }: { item: any }) => h('div', { class: 'item' }, item),
-        },
+          default: ({ item }: { item: any }) => h('div', { class: 'item' }, item)
+        }
       })
     }
     propsData = {
       height: elementHeight,
       items: [1, 2, 3],
-      itemHeight: 50,
+      itemHeight: 50
     }
 
     // mock clientHeight
@@ -44,7 +44,7 @@ describe('VVirtualScroll.ts', () => {
 
   it('should render component with scopedSlot and match snapshot', async () => {
     const wrapper = mountFunction({
-      props: propsData,
+      props: propsData
     })
 
     await nextTick()
@@ -53,7 +53,7 @@ describe('VVirtualScroll.ts', () => {
 
   it('should set height of scrollable element', () => {
     const wrapper = mountFunction({
-      props: propsData,
+      props: propsData
     })
 
     const scrollable = wrapper.find('.v-virtual-scroll__container')
@@ -65,8 +65,8 @@ describe('VVirtualScroll.ts', () => {
       props: {
         height: elementHeight,
         items: [1, 2, 3, 4, 5, 6, 7, 8, 9, 0],
-        itemHeight: 50,
-      },
+        itemHeight: 50
+      }
     })
 
     await nextTick()
@@ -78,8 +78,8 @@ describe('VVirtualScroll.ts', () => {
       props: {
         height: elementHeight,
         items: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20],
-        itemHeight: 50,
-      },
+        itemHeight: 50
+      }
     })
 
     wrapper.vm.scrollTop = 500
@@ -93,7 +93,7 @@ describe('VVirtualScroll.ts', () => {
     const helpers = require('../../../util/helpers')
     const spy = jest.spyOn(helpers, 'getSlot')
     const wrapper = mountFunction({
-      props: propsData,
+      props: propsData
     })
 
     wrapper.vm.first = 2
@@ -102,7 +102,7 @@ describe('VVirtualScroll.ts', () => {
 
     expect(spy.mock.calls[0][2]).toEqual({
       item: 0,
-      index: 3,
+      index: 3
     })
   })
 })

package/src/components/VWindow/VWindow.ts

@@ -1,10 +1,9 @@
-import {h, withDirectives} from 'vue'
+import { h, withDirectives, PropType, defineComponent } from 'vue'
 // Styles
 import './VWindow.sass'
 
 // Types
-import { VNode, VNodeDirective } from 'vue/types/vnode'
-import { PropType, defineComponent } from 'vue'
+import type { VNode, VNodeDirective } from '../../types/vue-internal'
 import { TouchHandlers } from 'vuetify/types'
 
 // Directives
@@ -21,30 +20,29 @@ export default defineComponent({
   name: 'v-window',
   extends: BaseItemGroup,
 
-
   provide (): object {
     return {
-      windowGroup: this,
+      windowGroup: this
     }
   },
 
   props: {
     activeClass: {
       type: String,
-      default: 'v-window-item--active',
+      default: 'v-window-item--active'
     },
     continuous: Boolean,
     mandatory: {
       type: Boolean,
-      default: true,
+      default: true
     },
     nextIcon: {
       type: [Boolean, String],
-      default: '$next',
+      default: '$next'
     },
     prevIcon: {
       type: [Boolean, String],
-      default: '$prev',
+      default: '$prev'
     },
     reverse: Boolean,
     showArrows: Boolean,
@@ -52,9 +50,9 @@ export default defineComponent({
     touch: Object as PropType<TouchHandlers>,
     touchless: Boolean,
     modelValue: {
-      required: false,
+      required: false
     },
-    vertical: Boolean,
+    vertical: Boolean
   },
 
   data () {
@@ -64,7 +62,7 @@ export default defineComponent({
       transitionHeight: undefined as undefined | string, // Intermediate height during transition.
       transitionCount: 0, // Number of windows in transition state.
       isBooted: false,
-      isReverse: false,
+      isReverse: false
     }
   },
 
@@ -75,7 +73,7 @@ export default defineComponent({
     classes (): object {
       return {
         ...BaseItemGroup.computed.classes.call(this),
-        'v-window--show-arrows-on-hover': this.showArrowsOnHover,
+        'v-window--show-arrows-on-hover': this.showArrowsOnHover
       }
     },
     computedTransition (): string {
@@ -105,13 +103,13 @@ export default defineComponent({
     },
     internalReverse (): boolean {
       return this.$vuetify.rtl ? !this.reverse : this.reverse
-    },
+    }
   },
 
   watch: {
     internalIndex (val, oldVal) {
       this.isReverse = this.updateReverse(val, oldVal)
-    },
+    }
   },
 
   mounted () {
@@ -131,11 +129,11 @@ export default defineComponent({
 
       return h('div', {
         class: ['v-window__container', {
-          'v-window__container--is-active': this.isActive,
+          'v-window__container--is-active': this.isActive
         }],
         style: {
-          height: this.internalHeight || this.transitionHeight,
-        },
+          height: this.internalHeight || this.transitionHeight
+        }
       }, children)
     },
     genIcon (
@@ -143,7 +141,6 @@ export default defineComponent({
       icon: string,
       click: () => void
     ) {
-
       const attrs = {
         'aria-label': this.$vuetify.lang.t(`$vuetify.carousel.${direction}`),
         onClick: (e: Event) => {
@@ -153,22 +150,22 @@ export default defineComponent({
         }
       }
       const children = this.$slots[direction]?.({
-        attrs,
+        attrs
       }) ?? [h(VBtn, {
         icon: true,
-        ...attrs,
+        ...attrs
       }, {
         default: () => [
           h(VIcon, {
-            large: true,
+            large: true
           }, {
             default: () => icon
-          }),
+          })
         ]
       })]
 
       return h('div', {
-        class: `v-window__${direction}`,
+        class: `v-window__${direction}`
       }, children)
     },
     genControlIcons () {
@@ -251,7 +248,7 @@ export default defineComponent({
       } else {
         return val < oldVal
       }
-    },
+    }
   },
 
   render (): VNode {
@@ -274,7 +271,7 @@ export default defineComponent({
         },
         start: (e: TouchEvent) => {
           e.stopPropagation()
-        },
+        }
       }
 
       directives.push([
@@ -284,5 +281,5 @@ export default defineComponent({
     }
 
     return withDirectives(h('div', data, [this.genContainer()]), directives)
-  },
+  }
 })

package/src/components/VWindow/VWindowItem.ts

@@ -1,4 +1,4 @@
-import {h, vShow, withDirectives} from 'vue'
+import { h, vShow, withDirectives } from 'vue'
 // Components
 import VWindow from './VWindow'
 
@@ -21,7 +21,7 @@ const baseMixins = mixins(
   GroupableFactory('windowGroup', 'v-window-item', 'v-window')
 )
 
-interface options extends ExtractVue<typeof baseMixins> {
+type options = ExtractVue<typeof baseMixins> & {
   $el: HTMLElement
   windowGroup: InstanceType<typeof VWindow>
 }
@@ -31,26 +31,25 @@ export default baseMixins.extend({
 
   emits: ['change'],
 
-
   props: {
     disabled: Boolean,
     reverseTransition: {
       type: [Boolean, String],
-      default: undefined,
+      default: undefined
     },
     transition: {
       type: [Boolean, String],
-      default: undefined,
+      default: undefined
     },
     value: {
-      required: false,
-    },
+      required: false
+    }
   },
 
   data () {
     return {
       isActive: false,
-      inTransition: false,
+      inTransition: false
     }
   },
 
@@ -68,7 +67,7 @@ export default baseMixins.extend({
       return typeof this.reverseTransition !== 'undefined'
         ? this.reverseTransition || ''
         : this.windowGroup.computedTransition
-    },
+    }
   },
 
   methods: {
@@ -78,7 +77,7 @@ export default baseMixins.extend({
     genWindowItem () {
       return withDirectives(h('div', {
         class: ['v-window-item', this.classes],
-        ...this.$listeners,
+        ...this.$listeners
       }, this.genDefaultSlot()), [
         [
           vShow,
@@ -132,7 +131,7 @@ export default baseMixins.extend({
         // Set transition target height.
         this.windowGroup.transitionHeight = convertToUnit(el.clientHeight)
       })
-    },
+    }
   },
 
   render (): VNode {
@@ -149,9 +148,9 @@ export default baseMixins.extend({
       onLeaveCancelled: this.onTransitionCancelled,
 
       // Enter handler for height transition.
-      onEnter: this.onEnter,
+      onEnter: this.onEnter
     }, {
       default: () => this.showLazyContent(() => [this.genWindowItem()])
     })
-  },
+  }
 })