@dimailn/vuetify 2.7.2-alpha40 → 2.7.2-alpha42

package/src/components/VFooter/VFooter.ts

@@ -1,4 +1,4 @@
-import {h} from 'vue'
+import { h } from 'vue'
 // Styles
 import './VFooter.sass'
 
@@ -14,14 +14,14 @@ import mixins from '../../util/mixins'
 import { convertToUnit, getSlot, getTagValue } from '../../util/helpers'
 
 // Types
-import { VNode } from 'vue/types/vnode'
+import type { VNode } from '../../types/vue-internal'
 
 /* @vue/component */
 export default mixins(
   VSheet,
   Applicationable('footer', [
     'height',
-    'inset',
+    'inset'
   ]),
   SSRBootable
 ).extend({
@@ -30,14 +30,14 @@ export default mixins(
   props: {
     height: {
       default: 'auto',
-      type: [Number, String],
+      type: [Number, String]
     },
     inset: Boolean,
     padless: Boolean,
     tag: {
       type: String,
-      default: 'footer',
-    },
+      default: 'footer'
+    }
   },
 
   computed: {
@@ -50,7 +50,7 @@ export default mixins(
         'v-footer--absolute': this.absolute,
         'v-footer--fixed': !this.absolute && (this.app || this.fixed),
         'v-footer--padless': this.padless,
-        'v-footer--inset': this.inset,
+        'v-footer--inset': this.inset
       }
     },
     computedBottom (): number | undefined {
@@ -89,9 +89,9 @@ export default mixins(
         height: isNaN(height) ? height : convertToUnit(height),
         left: convertToUnit(this.computedLeft),
         right: convertToUnit(this.computedRight),
-        bottom: convertToUnit(this.computedBottom),
+        bottom: convertToUnit(this.computedBottom)
       }
-    },
+    }
   },
 
   methods: {
@@ -101,16 +101,15 @@ export default mixins(
       return isNaN(height)
         ? this.$el ? this.$el.clientHeight : 0
         : height
-    },
+    }
   },
 
   render (): VNode {
     const data = this.setBackgroundColor(this.color, {
-      class: 'v-footer',
-      class: this.classes,
-      style: this.styles,
+      class: { 'v-footer': true, ...(this.classes as Record<string, boolean>) },
+      style: this.styles
     })
 
     return h(getTagValue(this.tag), data, getSlot(this))
-  },
+  }
 })

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

@@ -5,7 +5,7 @@ import VFooter from '../VFooter'
 import {
   mount,
   VueWrapper,
-  enableAutoUnmount,
+  enableAutoUnmount
 } from '@vue/test-utils'
 
 describe('VFooter.ts', () => {
@@ -22,12 +22,12 @@ describe('VFooter.ts', () => {
             $vuetify: {
               application: {
                 register: () => {},
-                unregister: () => {},
-              },
-            },
-          },
+                unregister: () => {}
+              }
+            }
+          }
         },
-        ...options,
+        ...options
       })
     }
   })
@@ -45,7 +45,7 @@ describe('VFooter.ts', () => {
   it('should return computed values when using app', async () => {
     const wrapper = mountFunction({
       props: {
-        app: true,
+        app: true
       },
       global: {
         mocks: {
@@ -56,11 +56,11 @@ describe('VFooter.ts', () => {
               left: 300,
               right: 200,
               register: () => {},
-              unregister: () => {},
-            },
-          },
-        },
-      },
+              unregister: () => {}
+            }
+          }
+        }
+      }
     })
 
     expect(wrapper.vm.computedBottom).toBe(64)

package/src/components/VForm/VForm.ts

@@ -47,7 +47,7 @@ export default mixins(
     disabled: Boolean,
     lazyValidation: Boolean,
     readonly: Boolean,
-    value: Boolean,
+    value: Boolean
   },
 
   emits: ['input', 'update:modelValue', 'submit'],
@@ -55,7 +55,7 @@ export default mixins(
   data: () => ({
     inputs: [] as VInputInstance[],
     watchers: [] as Watchers[],
-    errorBag: {} as ErrorBag,
+    errorBag: {} as ErrorBag
   }),
 
   watch: {
@@ -67,8 +67,8 @@ export default mixins(
         this.$emit('update:modelValue', !errors)
       },
       deep: true,
-      immediate: true,
-    },
+      immediate: true
+    }
   },
 
   methods: {
@@ -93,7 +93,7 @@ export default mixins(
       const watchers: Watchers = {
         _uid: inputId,
         valid: () => {},
-        shouldValidate: () => {},
+        shouldValidate: () => {}
       }
 
       if (this.lazyValidation) {
@@ -156,7 +156,7 @@ export default mixins(
       this.inputs = this.inputs.filter((inputComponent: VInputInstance) => this.getInputUid(inputComponent) !== inputId)
 
       delete this.errorBag[inputId]
-    },
+    }
   },
 
   render (): VNode {
@@ -164,7 +164,7 @@ export default mixins(
       class: 'v-form',
       novalidate: true,
       ...this.attrs$,
-      onSubmit: (e: Event) => this.$emit('submit', e),
+      onSubmit: (e: Event) => this.$emit('submit', e)
     }, getSlot(this))
-  },
+  }
 })

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

@@ -9,7 +9,7 @@ import VTextField from '../../VTextField'
 import {
   mount,
   MountingOptions,
-  VueWrapper,
+  VueWrapper
 } from '@vue/test-utils'
 
 import { wait } from '../../../../test'
@@ -18,10 +18,10 @@ const errorInput = {
   render () {
     return h(VTextField, {
       props: {
-        rules: [v => v === 1 || 'Error'],
-      },
+        rules: [v => v === 1 || 'Error']
+      }
     })
-  },
+  }
 }
 
 describe('VForm.ts', () => {
@@ -37,16 +37,16 @@ describe('VForm.ts', () => {
           mocks: {
             $vuetify: {
               lang: {
-                t: (val: string) => val,
+                t: (val: string) => val
               },
               rtl: false,
               theme: {
-                dark: false,
-              },
-            },
-          },
+                dark: false
+              }
+            }
+          }
         },
-        ...options,
+        ...options
       })
     }
   })
@@ -57,13 +57,13 @@ describe('VForm.ts', () => {
     const component = {
       render () {
         return h(VForm, {
-          onSubmit: submit,
+          onSubmit: submit
         }, {
           default: () => [
-            h('button', ['Submit']),
+            h('button', ['Submit'])
           ]
         })
-      },
+      }
     }
 
     const wrapper = mount(component)
@@ -103,8 +103,8 @@ describe('VForm.ts', () => {
   it('should register input child', async () => {
     const wrapper = mountFunction({
       slots: {
-        default: () => [h(VTextField)],
-      },
+        default: () => [h(VTextField)]
+      }
     })
 
     await wrapper.vm.$nextTick()
@@ -115,11 +115,11 @@ describe('VForm.ts', () => {
   it('should emit input when calling validate on lazy-validated form', async () => {
     const wrapper = mountFunction({
       props: {
-        lazyValidation: true,
+        lazyValidation: true
       },
       slots: {
-        default: () => [h(errorInput)],
-      },
+        default: () => [h(errorInput)]
+      }
     })
 
     // В Vue 3 validate может возвращать true если нет ошибок
@@ -135,8 +135,8 @@ describe('VForm.ts', () => {
   it('resetValidation should work', async () => {
     const wrapper = mountFunction({
       slots: {
-        default: () => [h(VTextField)],
-      },
+        default: () => [h(VTextField)]
+      }
     })
 
     expect(Object.keys(wrapper.vm.errorBag)).toHaveLength(1)
@@ -155,8 +155,8 @@ describe('VForm.ts', () => {
   it('should register and unregister items', () => {
     const wrapper = mountFunction({
       slots: {
-        default: () => [h(VTextField)],
-      },
+        default: () => [h(VTextField)]
+      }
     })
 
     expect(wrapper.vm.inputs).toHaveLength(1)
@@ -206,8 +206,8 @@ describe('VForm.ts', () => {
   it('should reset validation', async () => {
     const wrapper = mountFunction({
       slots: {
-        default: () => [h(VTextField)],
-      },
+        default: () => [h(VTextField)]
+      }
     })
 
     // Просто проверяем что метод существует и не выбрасывает ошибку
@@ -220,8 +220,8 @@ describe('VForm.ts', () => {
     const validate = jest.fn(() => false)
     const wrapper = mountFunction({
       slots: {
-        default: () => Array(2).fill(h(errorInput)),
-      },
+        default: () => Array(2).fill(h(errorInput))
+      }
     })
 
     wrapper.vm.inputs.forEach(input => {
@@ -242,7 +242,7 @@ describe('VForm.ts', () => {
 
     const wrapper = mountFunction({
       props: { disabled: true },
-      slots: { default: () => inputs.map(comp => h(comp)) },
+      slots: { default: () => inputs.map(comp => h(comp)) }
     })
 
     await wrapper.vm.$nextTick()
@@ -260,12 +260,12 @@ describe('VForm.ts', () => {
       functional: true,
       render () {
         return [h(VTextField), h(VTextField, { props: { disabled: false } })]
-      },
+      }
     }
 
     const wrapper = mountFunction({
       props: { disabled: true },
-      slots: { default: () => [h(inputs)] },
+      slots: { default: () => [h(inputs)] }
     })
 
     await wrapper.vm.$nextTick()

package/src/components/VGrid/VCol.ts

@@ -1,9 +1,9 @@
 import './VGrid.sass'
 
-import { defineComponent, VNode, PropOptions, getCurrentInstance } from 'vue'
+import { defineComponent, VNode, getCurrentInstance, h } from 'vue'
+import type { PropOptions } from '../../types/vue-internal'
 import mergeData from '../../util/mergeData'
 import { upperFirst, getTagValue } from '../../util/helpers'
-import {h} from 'vue'
 // no xs
 const breakpoints = ['sm', 'md', 'lg', 'xl']
 
@@ -11,7 +11,7 @@ const breakpointProps = (() => {
   return breakpoints.reduce((props, val) => {
     props[val] = {
       type: [Boolean, String, Number],
-      default: false,
+      default: false
     }
     return props
   }, {} as Dictionary<PropOptions>)
@@ -21,7 +21,7 @@ const offsetProps = (() => {
   return breakpoints.reduce((props, val) => {
     props['offset' + upperFirst(val)] = {
       type: [String, Number],
-      default: null,
+      default: null
     }
     return props
   }, {} as Dictionary<PropOptions>)
@@ -31,7 +31,7 @@ const orderProps = (() => {
   return breakpoints.reduce((props, val) => {
     props['order' + upperFirst(val)] = {
       type: [String, Number],
-      default: null,
+      default: null
     }
     return props
   }, {} as Dictionary<PropOptions>)
@@ -40,7 +40,7 @@ const orderProps = (() => {
 const propMap = {
   col: Object.keys(breakpointProps),
   offset: Object.keys(offsetProps),
-  order: Object.keys(orderProps),
+  order: Object.keys(orderProps)
 }
 
 function breakpointClass (type: keyof typeof propMap, prop: string, val: boolean | string | number) {
@@ -72,28 +72,28 @@ export default defineComponent({
   props: {
     cols: {
       type: [Boolean, String, Number],
-      default: false,
+      default: false
     },
     ...breakpointProps,
     offset: {
       type: [String, Number],
-      default: null,
+      default: null
     },
     ...offsetProps,
     order: {
       type: [String, Number],
-      default: null,
+      default: null
     },
     ...orderProps,
     alignSelf: {
       type: String,
       default: null,
-      validator: (str: any) => ['auto', 'start', 'end', 'center', 'baseline', 'stretch'].includes(str),
+      validator: (str: any) => ['auto', 'start', 'end', 'center', 'baseline', 'stretch'].includes(str)
     },
     tag: {
       type: String,
-      default: 'div',
-    },
+      default: 'div'
+    }
   },
   render (): VNode {
     const props = this.$props
@@ -128,12 +128,12 @@ export default defineComponent({
         [`col-${props.cols}`]: props.cols,
         [`offset-${props.offset}`]: props.offset,
         [`order-${props.order}`]: props.order,
-        [`align-self-${props.alignSelf}`]: props.alignSelf,
+        [`align-self-${props.alignSelf}`]: props.alignSelf
       })
 
       cache.set(cacheKey, classList)
     }
 
     return h(getTagValue(props.tag), mergeData({ class: classList }, data), children)
-  },
+  }
 })

package/src/components/VGrid/VContainer.ts

@@ -16,12 +16,12 @@ export default defineComponent({
     id: String,
     tag: {
       type: String,
-      default: 'div',
+      default: 'div'
     },
     fluid: {
       type: Boolean,
-      default: false,
-    },
+      default: false
+    }
   },
   render () {
     let classes
@@ -53,8 +53,8 @@ export default defineComponent({
       class: [
         'container',
         { 'container--fluid': this.fluid },
-        ...(classes || []),
-      ],
+        ...(classes || [])
+      ]
     })
 
     if (this.id) {
@@ -66,5 +66,5 @@ export default defineComponent({
       data,
       this.$slots.default?.()
     )
-  },
+  }
 })

package/src/components/VGrid/VRow.ts

@@ -1,9 +1,9 @@
 import './VGrid.sass'
 
-import { defineComponent, PropOptions } from 'vue'
+import { defineComponent, h } from 'vue'
+import type { PropOptions } from '../../types/vue-internal'
 import mergeData from '../../util/mergeData'
 import { upperFirst, getTagValue } from '../../util/helpers'
-import {h} from 'vue'
 // no xs
 const breakpoints = ['sm', 'md', 'lg', 'xl']
 
@@ -20,33 +20,33 @@ const alignValidator = (str: any) => [...ALIGNMENT, 'baseline', 'stretch'].inclu
 const alignProps = makeProps('align', () => ({
   type: String,
   default: null,
-  validator: alignValidator,
+  validator: alignValidator
 }))
 
 const justifyValidator = (str: any) => [...ALIGNMENT, 'space-between', 'space-around'].includes(str)
 const justifyProps = makeProps('justify', () => ({
   type: String,
   default: null,
-  validator: justifyValidator,
+  validator: justifyValidator
 }))
 
 const alignContentValidator = (str: any) => [...ALIGNMENT, 'space-between', 'space-around', 'stretch'].includes(str)
 const alignContentProps = makeProps('alignContent', () => ({
   type: String,
   default: null,
-  validator: alignContentValidator,
+  validator: alignContentValidator
 }))
 
 const propMap = {
   align: Object.keys(alignProps),
   justify: Object.keys(justifyProps),
-  alignContent: Object.keys(alignContentProps),
+  alignContent: Object.keys(alignContentProps)
 }
 
 const classMap = {
   align: 'align',
   justify: 'justify',
-  alignContent: 'align-content',
+  alignContent: 'align-content'
 }
 
 function breakpointClass (type: keyof typeof propMap, prop: string, val: string) {
@@ -72,28 +72,28 @@ export default defineComponent({
   props: {
     tag: {
       type: String,
-      default: 'div',
+      default: 'div'
     },
     dense: Boolean,
     noGutters: Boolean,
     align: {
       type: String,
       default: null,
-      validator: alignValidator,
+      validator: alignValidator
     },
     ...alignProps,
     justify: {
       type: String,
       default: null,
-      validator: justifyValidator,
+      validator: justifyValidator
     },
     ...justifyProps,
     alignContent: {
       type: String,
       default: null,
-      validator: alignContentValidator,
+      validator: alignContentValidator
     },
-    ...alignContentProps,
+    ...alignContentProps
   },
   render () {
     // Super-fast memoization based on props, 5x faster than JSON.stringify
@@ -121,7 +121,7 @@ export default defineComponent({
         'row--dense': props.dense,
         [`align-${props.align}`]: props.align,
         [`justify-${props.justify}`]: props.justify,
-        [`align-content-${props.alignContent}`]: props.alignContent,
+        [`align-content-${props.alignContent}`]: props.alignContent
       })
 
       cache.set(cacheKey, classList)
@@ -130,9 +130,9 @@ export default defineComponent({
     return h(
       getTagValue(props.tag),
       mergeData(this.$attrs, {
-        class: classList.concat('row'),
+        class: classList.concat('row')
       }),
       this.$slots.default()
     )
-  },
+  }
 })

package/src/components/VGrid/__tests__/VCol.spec.ts

@@ -17,8 +17,8 @@ describe('layout > col', () => {
   it('renders custom root element when tag prop set', async () => {
     const wrapper = mount(VCol, {
       props: {
-        tag: 'span',
-      },
+        tag: 'span'
+      }
     })
 
     expect(wrapper.element.tagName).toBe('SPAN')
@@ -35,8 +35,8 @@ describe('layout > col', () => {
         sm: 5,
         md: 4,
         lg: 3,
-        xl: 2,
-      },
+        xl: 2
+      }
     })
 
     expect(wrapper.element.tagName).toBe('DIV')
@@ -55,8 +55,8 @@ describe('layout > col', () => {
         offsetSm: 5,
         offsetMd: 4,
         offsetLg: 3,
-        offsetXl: 2,
-      },
+        offsetXl: 2
+      }
     })
 
     expect(wrapper.element.tagName).toBe('DIV')
@@ -76,8 +76,8 @@ describe('layout > col', () => {
         orderSm: 5,
         orderMd: 4,
         orderLg: 3,
-        orderXl: 2,
-      },
+        orderXl: 2
+      }
     })
 
     expect(wrapper.element.tagName).toBe('DIV')
@@ -96,8 +96,8 @@ describe('layout > col', () => {
         sm: true,
         md: true,
         lg: true,
-        xl: true,
-      },
+        xl: true
+      }
     })
 
     expect(wrapper.element.tagName).toBe('DIV')
@@ -115,8 +115,8 @@ describe('layout > col', () => {
         sm: '',
         md: '',
         lg: '',
-        xl: '',
-      },
+        xl: ''
+      }
     })
 
     expect(wrapper.element.tagName).toBe('DIV')
@@ -131,8 +131,8 @@ describe('layout > col', () => {
   it('should apply ".align-self-*" class with "align-self" prop', async () => {
     const wrapper = mount(VCol, {
       props: {
-        alignSelf: 'center',
-      },
+        alignSelf: 'center'
+      }
     })
 
     expect(wrapper.element.tagName).toBe('DIV')