@dimailn/vuetify 2.7.2-alpha40 → 2.7.2-alpha42

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

@@ -4,7 +4,7 @@ import VSparkline from '../VSparkline'
 // Utilities
 import {
   mount,
-  enableAutoUnmount,
+  enableAutoUnmount
 } from '@vue/test-utils'
 import { nextTick } from 'vue'
 
@@ -13,15 +13,15 @@ describe('VSparkline.ts', () => {
 
   const mountFunction = (options = {}) => {
     return mount(VSparkline, {
-      ...options,
+      ...options
     })
   }
 
   it('should render component and match a snapshot', async () => {
     const wrapper = mountFunction({
       props: {
-        value: [1, 7, 42],
-      },
+        value: [1, 7, 42]
+      }
     })
 
     expect(wrapper.html()).toMatchSnapshot()
@@ -31,8 +31,8 @@ describe('VSparkline.ts', () => {
     const wrapper = mountFunction({
       props: {
         value: [1, 7, 42],
-        padding: 20,
-      },
+        padding: 20
+      }
     })
 
     expect(wrapper.html()).toMatchSnapshot()
@@ -42,8 +42,8 @@ describe('VSparkline.ts', () => {
     const wrapper = mountFunction({
       props: {
         value: [1, 7, 42],
-        smooth: 20,
-      },
+        smooth: 20
+      }
     })
 
     expect(wrapper.html()).toMatchSnapshot()
@@ -53,8 +53,8 @@ describe('VSparkline.ts', () => {
     const wrapper = mountFunction({
       props: {
         value: [1, 7, 42],
-        lineWidth: 42,
-      },
+        lineWidth: 42
+      }
     })
 
     expect(wrapper.html()).toMatchSnapshot()
@@ -64,8 +64,8 @@ describe('VSparkline.ts', () => {
     const wrapper = mountFunction({
       props: {
         value: [1, 7, 42],
-        gradient: ['#000', 'red', 'rgba(80, 160, 240, 0.5)'],
-      },
+        gradient: ['#000', 'red', 'rgba(80, 160, 240, 0.5)']
+      }
     })
 
     expect(wrapper.html()).toMatchSnapshot()
@@ -75,8 +75,8 @@ describe('VSparkline.ts', () => {
     const wrapper = mountFunction({
       props: {
         showLabels: true,
-        value: [1, 7, 42],
-      },
+        value: [1, 7, 42]
+      }
     })
 
     expect(wrapper.html()).toMatchSnapshot()
@@ -84,21 +84,21 @@ describe('VSparkline.ts', () => {
     await wrapper.setProps({
       value: [
         {
-          value: 2,
+          value: 2
         },
         {
-          value: 8,
+          value: 8
         },
         {
-          value: 43,
-        },
-      ],
+          value: 43
+        }
+      ]
     })
 
     expect(wrapper.html()).toMatchSnapshot()
 
     await wrapper.setProps({
-      labels: ['foo', 'bar', 'baz'],
+      labels: ['foo', 'bar', 'baz']
     })
 
     expect(wrapper.html()).toMatchSnapshot()
@@ -108,8 +108,8 @@ describe('VSparkline.ts', () => {
     const wrapper = mountFunction({
       props: {
         value: [1, 7, 42],
-        type: 'bar',
-      },
+        type: 'bar'
+      }
     })
 
     expect(wrapper.html()).toMatchSnapshot()
@@ -119,8 +119,8 @@ describe('VSparkline.ts', () => {
     const wrapper = mountFunction({
       props: {
         value: [-1, 1, 7, 42],
-        type: 'bar',
-      },
+        type: 'bar'
+      }
     })
 
     expect(wrapper.html()).toMatchSnapshot()
@@ -131,8 +131,8 @@ describe('VSparkline.ts', () => {
       props: {
         value: [1, 7, 42],
         gradient: ['#000', 'red', 'rgba(80, 160, 240, 0.5)'],
-        type: 'bar',
-      },
+        type: 'bar'
+      }
     })
 
     expect(wrapper.html()).toMatchSnapshot()
@@ -143,8 +143,8 @@ describe('VSparkline.ts', () => {
       props: {
         value: [1, 7, 42],
         labels: ['Value 1', 'Value 2', 'Value 3'],
-        type: 'bar',
-      },
+        type: 'bar'
+      }
     })
 
     expect(wrapper.html()).toMatchSnapshot()
@@ -155,8 +155,8 @@ describe('VSparkline.ts', () => {
       props: {
         value: [1, 7, 42],
         type: 'bar',
-        autoLineWidth: true,
-      },
+        autoLineWidth: true
+      }
     })
 
     expect(wrapper.html()).toMatchSnapshot()
@@ -167,8 +167,8 @@ describe('VSparkline.ts', () => {
       props: {
         value: [1, 7, 42],
         type: 'bar',
-        lineWidth: 8,
-      },
+        lineWidth: 8
+      }
     })
 
     expect(wrapper.html()).toMatchSnapshot()
@@ -179,8 +179,8 @@ describe('VSparkline.ts', () => {
       props: {
         value: [1, 7, 42],
         type: 'bar',
-        padding: 12,
-      },
+        padding: 12
+      }
     })
 
     expect(wrapper.html()).toMatchSnapshot()
@@ -192,8 +192,8 @@ describe('VSparkline.ts', () => {
         value: [1, 7, 42],
         type: 'bar',
         autoLineWidth: true,
-        padding: 12,
-      },
+        padding: 12
+      }
     })
 
     expect(wrapper.html()).toMatchSnapshot()
@@ -205,8 +205,8 @@ describe('VSparkline.ts', () => {
         value: [1, 7, 42],
         labels: ['Value 1', 'Value 2', 'Value 3'],
         labelSize: 15,
-        type: 'bar',
-      },
+        type: 'bar'
+      }
     })
 
     expect(wrapper.html()).toMatchSnapshot()
@@ -216,8 +216,8 @@ describe('VSparkline.ts', () => {
     const wrapper = mountFunction({
       props: {
         value: [1, 1, 1],
-        type: 'trend',
-      },
+        type: 'trend'
+      }
     })
 
     expect(wrapper.html()).toMatchSnapshot()
@@ -228,8 +228,8 @@ describe('VSparkline.ts', () => {
       props: {
         value: [1, 7, 42],
         showLabels: true,
-        labelSize: 14,
-      },
+        labelSize: 14
+      }
     })
 
     expect(wrapper.html()).toMatchSnapshot()
@@ -240,8 +240,8 @@ describe('VSparkline.ts', () => {
       props: {
         value: [1, 7, 42],
         showLabels: true,
-        lineWidth: 20,
-      },
+        lineWidth: 20
+      }
     })
 
     expect(wrapper.html()).toMatchSnapshot()
@@ -251,14 +251,14 @@ describe('VSparkline.ts', () => {
     const wrapper = mountFunction({
       props: {
         value: [1, 2],
-        type: 'bar',
-      },
+        type: 'bar'
+      }
     })
 
     expect(wrapper.html()).toMatchSnapshot()
 
     await wrapper.setProps({
-      value: [-1, -2],
+      value: [-1, -2]
     })
     await nextTick()
 
@@ -269,8 +269,8 @@ describe('VSparkline.ts', () => {
     const wrapper = mountFunction({
       props: {
         value: [0, 0, 0],
-        type: 'bar',
-      },
+        type: 'bar'
+      }
     })
 
     expect(wrapper.html()).toMatchSnapshot()

package/src/components/VSparkline/helpers/core.ts

@@ -16,7 +16,7 @@ export function genPoints (
     return {
       x: minX + index * gridX,
       y: maxY - (value - minValue) * gridY,
-      value,
+      value
     }
   })
 }
@@ -45,7 +45,7 @@ export function genBars (
       y: horizonY - height +
         +(value < 0) * height,
       height,
-      value,
+      value
     }
   })
 }

package/src/components/VSparkline/helpers/math.ts

@@ -26,6 +26,6 @@ export function moveTo (to: Point, from: Point, radius: number) {
 
   return {
     x: from.x + unitVector.x * radius,
-    y: from.y + unitVector.y * radius,
+    y: from.y + unitVector.y * radius
   }
 }

package/src/components/VSpeedDial/VSpeedDial.ts

@@ -1,4 +1,5 @@
-import { TransitionGroup, h, VNode, VNodeData, withDirectives } from 'vue'
+import { TransitionGroup, h, VNode, withDirectives, PropType } from 'vue'
+import type { VNodeData } from '../../types/vue-internal'
 // Styles
 import './VSpeedDial.sass'
 
@@ -13,7 +14,6 @@ import ClickOutside from '../../directives/click-outside'
 // Types
 import mixins from '../../util/mixins'
 
-import { Prop } from 'vue/types/options'
 import { getSlot } from '../../util/helpers'
 
 /* @vue/component */
@@ -22,17 +22,17 @@ export default mixins(Positionable, Toggleable, Transitionable).extend({
 
   props: {
     direction: {
-      type: String as Prop<'top' | 'right' | 'bottom' | 'left'>,
+      type: String as PropType<'top' | 'right' | 'bottom' | 'left'>,
       default: 'top',
       validator: (val: string) => {
         return ['top', 'right', 'bottom', 'left'].includes(val)
-      },
+      }
     },
     openOnHover: Boolean,
     transition: {
       type: String,
-      default: 'scale-transition',
-    },
+      default: 'scale-transition'
+    }
   },
 
   emits: ['update:modelValue'],
@@ -48,16 +48,16 @@ export default mixins(Positionable, Toggleable, Transitionable).extend({
         'v-speed-dial--absolute': this.absolute,
         'v-speed-dial--fixed': this.fixed,
         [`v-speed-dial--direction-${this.direction}`]: true,
-        'v-speed-dial--is-active': this.isActive,
+        'v-speed-dial--is-active': this.isActive
       }
-    },
+    }
   },
 
   render (): VNode {
     let children: VNode[] = []
     const data: VNodeData = {
       class: this.classes,
-      onClick: () => (this.isActive = !this.isActive),
+      onClick: () => (this.isActive = !this.isActive)
     }
 
     if (this.openOnHover) {
@@ -67,15 +67,17 @@ export default mixins(Positionable, Toggleable, Transitionable).extend({
 
     if (this.isActive) {
       let btnCount = 0
-      children = (getSlot(this) || []).map((b, i) => {
-        const componentName = b.type && typeof b.type === 'object' && 'name' in b.type ? b.type.name : null
-        if (b.tag && (componentName === 'v-btn' || componentName === 'v-tooltip')) {
+      const raw = getSlot(this)
+      const nodes = (Array.isArray(raw) ? raw : raw != null ? [raw] : []) as VNode[]
+      children = nodes.map((b, i) => {
+        const componentName = b.type && typeof b.type === 'object' && 'name' in b.type ? (b.type as { name?: string }).name : null
+        if (componentName === 'v-btn' || componentName === 'v-tooltip') {
           btnCount++
           return h('div', {
             style: {
-              transitionDelay: btnCount * 0.05 + 's',
+              transitionDelay: btnCount * 0.05 + 's'
             },
-            key: i,
+            key: i
           }, [b])
         } else {
           b.key = i
@@ -89,11 +91,11 @@ export default mixins(Positionable, Toggleable, Transitionable).extend({
       name: this.transition,
       mode: this.mode,
       origin: this.origin,
-      tag: 'div',
-    }, children)
+      tag: 'div'
+    }, () => children)
 
-    return withDirectives(h('div', data, [getSlot(this, 'activator'), list]), [
-      [ClickOutside, () => (this.isActive = false)],
-    ])
-  },
+    return withDirectives(h('div', data, [getSlot(this, 'activator'), list] as any), [
+      [ClickOutside, () => (this.isActive = false)]
+    ] as any)
+  }
 })

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

@@ -7,7 +7,7 @@ import VTooltip from '../../VTooltip/VTooltip'
 import {
   mount,
   Wrapper,
-  enableAutoUnmount,
+  enableAutoUnmount
 } from '@vue/test-utils'
 import { h } from 'vue'
 
@@ -20,7 +20,7 @@ describe('VSpeedDial.ts', () => {
   beforeEach(() => {
     mountFunction = (options = {}) => {
       return mount(VSpeedDial, {
-        ...options,
+        ...options
       })
     }
   })
@@ -34,9 +34,9 @@ describe('VSpeedDial.ts', () => {
   it('should render active component and match snapshot', () => {
     const wrapper = mountFunction({
       slots: {
-        default: () => h('span', 'test'),
+        default: () => h('span', 'test')
       },
-      data: () => ({ isActive: true }),
+      data: () => ({ isActive: true })
     })
 
     expect(wrapper.html()).toMatchSnapshot()
@@ -45,8 +45,8 @@ describe('VSpeedDial.ts', () => {
   it('should render component with custom direction and match snapshot', () => {
     const wrapper = mountFunction({
       props: {
-        direction: 'right',
-      },
+        direction: 'right'
+      }
     })
 
     expect(wrapper.html()).toMatchSnapshot()
@@ -63,8 +63,8 @@ describe('VSpeedDial.ts', () => {
   it('should activate on hover', async () => {
     const wrapper = mountFunction({
       props: {
-        openOnHover: true,
-      },
+        openOnHover: true
+      }
     })
 
     expect(wrapper.vm.isActive).toBe(false)
@@ -77,9 +77,9 @@ describe('VSpeedDial.ts', () => {
   it('should render v-btn and v-tooltip components when active', () => {
     const wrapper = mount(VSpeedDial, {
       slots: {
-        default: () => [h(VBtn, { key: 'btn' }), h(VTooltip, { key: 'tooltip' })],
+        default: () => [h(VBtn, { key: 'btn' }), h(VTooltip, { key: 'tooltip' })]
       },
-      data: () => ({ isActive: true }),
+      data: () => ({ isActive: true })
     })
 
     expect(wrapper.findComponent(VBtn).exists()).toBe(true)

package/src/components/VStepper/VStepper.ts

@@ -24,7 +24,7 @@ import { VNode } from 'vue'
 const baseMixins = mixins(
   VSheet,
   RegistrableProvide('stepper'),
-  Proxyable,
+  Proxyable
 )
 
 type VStepperStepInstance = InstanceType<typeof VStepperStep>
@@ -37,7 +37,7 @@ export default baseMixins.extend({
   provide (): object {
     return {
       stepClick: this.stepClick,
-      isVertical: this.vertical,
+      isVertical: this.vertical
     }
   },
 
@@ -45,7 +45,7 @@ export default baseMixins.extend({
     altLabels: Boolean,
     nonLinear: Boolean,
     flat: Boolean,
-    vertical: Boolean,
+    vertical: Boolean
   },
 
   emits: ['change'],
@@ -55,7 +55,7 @@ export default baseMixins.extend({
       isBooted: false,
       steps: [] as VStepperStepInstance[],
       content: [] as VStepperContentInstance[],
-      isReverse: false,
+      isReverse: false
     }
 
     data.internalLazyValue = this.modelValue != null
@@ -73,14 +73,14 @@ export default baseMixins.extend({
         'v-stepper--vertical': this.vertical,
         'v-stepper--alt-labels': this.altLabels,
         'v-stepper--non-linear': this.nonLinear,
-        ...VSheet.computed.classes.call(this),
+        ...VSheet.computed.classes.call(this)
       }
     },
     styles (): object {
       return {
-        ...VSheet.computed.styles.call(this),
+        ...VSheet.computed.styles.call(this)
       }
-    },
+    }
   },
 
   watch: {
@@ -90,7 +90,7 @@ export default baseMixins.extend({
       oldVal && (this.isBooted = true)
 
       this.updateView()
-    },
+    }
   },
 
   created () {
@@ -131,13 +131,13 @@ export default baseMixins.extend({
       for (let index = this.content.length; --index >= 0;) {
         this.content[index].toggle(this.internalValue as any, this.isReverse)
       }
-    },
+    }
   },
 
   render (): VNode {
     return h(getTagValue(this.tag), {
       class: ['v-stepper', this.classes],
-      style: this.styles,
+      style: this.styles
     }, getSlot(this))
-  },
+  }
 })

package/src/components/VStepper/VStepperContent.ts

@@ -1,8 +1,8 @@
-import {h, vShow, withDirectives} from 'vue'
+import { h, vShow, withDirectives } from 'vue'
 // Components
 import {
   VTabTransition,
-  VTabReverseTransition,
+  VTabReverseTransition
 } from '../transitions'
 
 // Mixins
@@ -15,13 +15,13 @@ import { convertToUnit, getSlot } from '../../util/helpers'
 import mixins from '../../util/mixins'
 
 // Types
-import { VNode, FunctionalComponentOptions, VNodeData } from 'vue'
+import type { VNode, VNodeData, FunctionalComponentOptions } from '../../types/vue-internal'
 
 const baseMixins = mixins(
   RegistrableInject('stepper', 'v-stepper-content', 'v-stepper')
 )
 
-interface options extends InstanceType<typeof baseMixins> {
+type options = {
   $refs: {
     wrapper: HTMLElement
   }
@@ -34,15 +34,15 @@ export default baseMixins.extend({
 
   inject: {
     isVerticalProvided: {
-      from: 'isVertical',
-    },
+      from: 'isVertical'
+    }
   },
 
   props: {
     step: {
       type: [Number, String],
-      required: true,
-    },
+      required: true
+    }
   },
 
   data () {
@@ -52,7 +52,7 @@ export default baseMixins.extend({
       // previous comparison
       isActive: null as boolean | null,
       isReverse: false,
-      isVertical: this.isVerticalProvided,
+      isVertical: this.isVerticalProvided
     }
   },
 
@@ -69,9 +69,9 @@ export default baseMixins.extend({
       if (!this.isVertical) return {}
 
       return {
-        height: convertToUnit(this.height),
+        height: convertToUnit(this.height)
       }
-    },
+    }
   },
 
   watch: {
@@ -87,7 +87,7 @@ export default baseMixins.extend({
 
       if (this.isActive) this.enter()
       else this.leave()
-    },
+    }
   },
 
   mounted () {
@@ -136,17 +136,17 @@ export default baseMixins.extend({
     toggle (step: string | number, reverse: boolean) {
       this.isActive = step.toString() === this.step.toString()
       this.isReverse = reverse
-    },
+    }
   },
 
   render (): VNode {
     const contentData = {
-      class: 'v-stepper__content',
+      class: 'v-stepper__content'
     } as VNodeData
     const wrapperData = {
       class: 'v-stepper__wrapper',
       style: this.styles,
-      ref: 'wrapper',
+      ref: 'wrapper'
     }
 
     const wrapper = h('div', wrapperData, getSlot(this))
@@ -161,7 +161,7 @@ export default baseMixins.extend({
     }
 
     return h(this.computedTransition, {
-      ...this.$listeners,
+      ...this.$listeners
     }, () => [content])
-  },
+  }
 })