@dimailn/vuetify 2.7.2-alpha40 → 2.7.2-alpha42

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

@@ -3,7 +3,7 @@ import VTextarea from '../VTextarea'
 import {
   mount,
   ComponentMountingOptions,
-  VueWrapper,
+  VueWrapper
 } from '@vue/test-utils'
 import { wait } from '../../../../test'
 
@@ -21,8 +21,8 @@ describe('VTextarea.ts', () => {
       attachTo: document.body,
       props: {
         modelValue: '',
-        autoGrow: true,
-      },
+        autoGrow: true
+      }
     })
 
     const el = wrapper.findAll('textarea')[0]
@@ -63,8 +63,8 @@ describe('VTextarea.ts', () => {
     const wrapper = mountFunction({
       attachTo: document.body,
       props: {
-        autoGrow: true,
-      },
+        autoGrow: true
+      }
     })
 
     // Ждем монтирования и выполнения setTimeout
@@ -95,8 +95,8 @@ describe('VTextarea.ts', () => {
     const wrapper = mountFunction({
       attachTo: document.body,
       props: {
-        autoGrow: true,
-      },
+        autoGrow: true
+      }
     })
 
     // Ждем монтирования и выполнения setTimeout
@@ -132,8 +132,8 @@ describe('VTextarea.ts', () => {
     const wrapper = mountFunction({
       attachTo: document.body,
       props: {
-        autoGrow: true,
-      },
+        autoGrow: true
+      }
     })
 
     // Заменяем метод на spy после монтирования
@@ -160,7 +160,7 @@ describe('VTextarea.ts', () => {
     const stopPropagation = jest.fn()
     const onKeyDown = {
       keyCode: keyCodes.enter,
-      stopPropagation,
+      stopPropagation
     }
     wrapper.vm.onKeyDown(onKeyDown)
 
@@ -176,7 +176,7 @@ describe('VTextarea.ts', () => {
   it('should render no-resize the same if already auto-grow', async () => {
     const wrappers = [
       { autoGrow: true, outlined: false },
-      { autoGrow: true, outlined: true },
+      { autoGrow: true, outlined: true }
     ].map(propsData => mountFunction({ props: propsData }))
 
     for (const wrapper of wrappers) {
@@ -207,8 +207,8 @@ describe('VTextarea.ts', () => {
   it('should dynamically adjust row-height', async () => {
     const wrapper = mountFunction({
       props: {
-        autoGrow: true,
-      },
+        autoGrow: true
+      }
     })
 
     await wait()
@@ -230,8 +230,8 @@ describe('VTextarea.ts', () => {
   it('should render with custom rows attribute', () => {
     const wrapper = mountFunction({
       props: {
-        rows: 3,
-      },
+        rows: 3
+      }
     })
     expect(wrapper.html()).toMatchSnapshot()
   })
@@ -239,8 +239,8 @@ describe('VTextarea.ts', () => {
   it('should render with rows as string', () => {
     const wrapper = mountFunction({
       props: {
-        rows: '10',
-      },
+        rows: '10'
+      }
     })
     expect(wrapper.html()).toMatchSnapshot()
   })
@@ -249,8 +249,8 @@ describe('VTextarea.ts', () => {
     const wrapper = mountFunction({
       props: {
         rows: 7,
-        autoGrow: true,
-      },
+        autoGrow: true
+      }
     })
     expect(wrapper.html()).toMatchSnapshot()
   })
@@ -258,8 +258,8 @@ describe('VTextarea.ts', () => {
   it('should have rows attribute in DOM', () => {
     const wrapper = mountFunction({
       props: {
-        rows: 8,
-      },
+        rows: 8
+      }
     })
 
     const textarea = wrapper.find('textarea')

package/src/components/VThemeProvider/VThemeProvider.ts

@@ -16,7 +16,7 @@ export default {
       return this.root
         ? this.rootIsDark
         : Themeable.computed.isDark.call(this)
-    },
+    }
   },
 
   render (): VNode {
@@ -25,5 +25,5 @@ export default {
       this.$slots.default! &&
       this.$slots.default!().find(node => !node.isComment && node.text !== ' ')!
     )
-  },
+  }
 }

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

@@ -7,7 +7,7 @@ import {
   MountingOptions,
   VueWrapper,
   config,
-  enableAutoUnmount,
+  enableAutoUnmount
 } from '@vue/test-utils'
 import { nextTick } from 'vue'
 
@@ -23,10 +23,10 @@ describe('VThemeProvider.ts', () => {
         ...options,
         global: {
           mocks: {
-            ...config.global.mocks,
+            ...config.global.mocks
           },
-          ...options.global,
-        },
+          ...options.global
+        }
       })
     }
   })
@@ -35,14 +35,14 @@ describe('VThemeProvider.ts', () => {
     const wrapper = mountFunction({
       global: {
         provide: {
-          theme: { isDark: true },
+          theme: { isDark: true }
         },
         mocks: {
           $vuetify: {
-            theme: { dark: false },
-          },
-        },
-      },
+            theme: { dark: false }
+          }
+        }
+      }
     })
 
     expect(wrapper.vm.isDark).toBe(true)
@@ -56,18 +56,18 @@ describe('VThemeProvider.ts', () => {
   it('should use $vuetify.theme.dark when root is true', async () => {
     const wrapper = mountFunction({
       props: {
-        root: true,
+        root: true
       },
       global: {
         provide: {
-          theme: { isDark: false },
+          theme: { isDark: false }
         },
         mocks: {
           $vuetify: {
-            theme: { dark: true },
-          },
-        },
-      },
+            theme: { dark: true }
+          }
+        }
+      }
     })
 
     expect(wrapper.vm.isDark).toBe(true)

package/src/components/VTimePicker/VTimePicker.ts

@@ -44,7 +44,7 @@ export default mixins(
       default: 'ampm',
       validator (val: any) {
         return ['ampm', '24hr'].includes(val)
-      },
+      }
     },
     min: String,
     max: String,
@@ -52,7 +52,7 @@ export default mixins(
     scrollable: Boolean,
     useSeconds: Boolean,
     modelValue: (null as any) as PropType<any>,
-    ampmInTitle: Boolean,
+    ampmInTitle: Boolean
   },
   emits: [
     'update:modelValue',
@@ -61,7 +61,7 @@ export default mixins(
     'update:period',
     'click:hour',
     'click:minute',
-    'click:second',
+    'click:second'
   ],
   data () {
     return {
@@ -72,7 +72,7 @@ export default mixins(
       lazyInputMinute: null as number | null,
       lazyInputSecond: null as number | null,
       period: 'am' as Period,
-      selecting: SelectingTimes.Hour,
+      selecting: SelectingTimes.Hour
     }
   },
 
@@ -83,7 +83,7 @@ export default mixins(
       },
       set (v: boolean) {
         this.selecting = SelectingTimes.Hour
-      },
+      }
     },
     selectingMinute: {
       get (): boolean {
@@ -91,7 +91,7 @@ export default mixins(
       },
       set (v: boolean) {
         this.selecting = SelectingTimes.Minute
-      },
+      }
     },
     selectingSecond: {
       get (): boolean {
@@ -99,7 +99,7 @@ export default mixins(
       },
       set (v: boolean) {
         this.selecting = SelectingTimes.Second
-      },
+      }
     },
     isAllowedHourCb (): AllowFunction {
       let cb: AllowFunction
@@ -199,7 +199,7 @@ export default mixins(
     },
     isAmPm (): boolean {
       return this.format === 'ampm'
-    },
+    }
   },
 
   watch: {
@@ -208,7 +208,7 @@ export default mixins(
     modelValue: {
       handler: 'setInputData',
       immediate: false
-    },
+    }
   },
 
   mounted () {
@@ -422,14 +422,14 @@ export default mixins(
               : this.inputSecond,
         onUpdateModelValue: this.onInput,
         onChange: this.onChange,
-        ref: 'clock',
+        ref: 'clock'
       })
     },
     genClockAmPm () {
       return h(
         'div',
         this.setTextColor(this.color || 'primary', {
-          class: 'v-time-picker-clock__ampm',
+          class: 'v-time-picker-clock__ampm'
         }),
         [
           this.genPickerButton(
@@ -443,7 +443,7 @@ export default mixins(
             'pm',
             this.$vuetify.lang.t('$vuetify.timePicker.pm'),
             this.disabled || this.readonly
-          ),
+          )
         ]
       )
     },
@@ -452,11 +452,11 @@ export default mixins(
         'div',
         {
           class: 'v-time-picker-clock__container',
-          key: this.selecting,
+          key: this.selecting
         },
         [
           !this.ampmInTitle && this.isAmPm && this.genClockAmPm(),
-          this.genClock(),
+          this.genClock()
         ]
       )
     },
@@ -478,12 +478,12 @@ export default mixins(
         'onUpdate:period': (period: string) => {
           this.$emit('update:period', period)
         },
-        ref: 'title',
+        ref: 'title'
       })
-    },
+    }
   },
 
   render (): VNode {
     return this.genPicker('v-picker--time')
-  },
+  }
 })

package/src/components/VTimePicker/VTimePickerClock.ts

@@ -1,4 +1,5 @@
-import { h, VNode, PropType, VNodeData } from 'vue'
+import { h, VNode, PropType } from 'vue'
+import type { VNodeData } from '../../types/vue-internal'
 import './VTimePickerClock.sass'
 
 // Mixins
@@ -20,14 +21,7 @@ interface options {
   }
 }
 
-export default mixins<options &
-/* eslint-disable indent */
-  ExtractVue<[
-    typeof Colorable,
-    typeof Themeable
-  ]>
-/* eslint-enable indent */
->(
+export default mixins(
   Colorable,
   Themeable
 /* @vue/component */
@@ -41,34 +35,34 @@ export default mixins<options &
     double: Boolean,
     format: {
       type: Function as PropType<(val: string | number) => string | number>,
-      default: (val: string | number) => val,
+      default: (val: string | number) => val
     },
     max: {
       type: Number,
-      required: true,
+      required: true
     },
     min: {
       type: Number,
-      required: true,
+      required: true
     },
     scrollable: Boolean,
     readonly: Boolean,
     rotate: {
       type: Number,
-      default: 0,
+      default: 0
     },
     step: {
       type: Number,
-      default: 1,
+      default: 1
     },
-    modelValue: Number,
+    modelValue: Number
   },
 
   data () {
     return {
       isDragging: false,
       valueOnMouseDown: null as number | null,
-      valueOnMouseUp: null as number | null,
+      valueOnMouseUp: null as number | null
     }
   },
 
@@ -90,10 +84,9 @@ export default mixins<options &
     },
     roundCount (): number {
       return this.double ? (this.count / 2) : this.count
-    },
+    }
   },
 
-
   methods: {
     wheel (e: WheelEvent) {
       e.preventDefault()
@@ -128,11 +121,11 @@ export default mixins<options &
             'v-time-picker-clock__item',
             {
               'v-time-picker-clock__item--active': value === this.displayedValue,
-              'v-time-picker-clock__item--disabled': this.disabled || !this.isAllowed(value),
-            },
+              'v-time-picker-clock__item--disabled': this.disabled || !this.isAllowed(value)
+            }
           ],
           style: this.getTransform(value),
-          innerHTML: `<span>${this.format(value)}</span>`,
+          innerHTML: `<span>${this.format(value)}</span>`
         })))
       }
 
@@ -146,26 +139,26 @@ export default mixins<options &
         class: [
           'v-time-picker-clock__hand',
           {
-            'v-time-picker-clock__hand--inner': this.isInner(this.modelValue),
-          },
+            'v-time-picker-clock__hand--inner': this.isInner(this.modelValue)
+          }
         ],
         style: {
-          transform: `rotate(${angle}deg) ${scale}`,
-        },
+          transform: `rotate(${angle}deg) ${scale}`
+        }
       }))
     },
     getTransform (i: number) {
       const { x, y } = this.getPosition(i)
       return {
         left: `${50 + x * 50}%`,
-        top: `${50 + y * 50}%`,
+        top: `${50 + y * 50}%`
       }
     },
     getPosition (value: number) {
       const rotateRadians = this.rotate * Math.PI / 180
       return {
         x: Math.sin((value - this.min) * this.degrees + rotateRadians) * this.handScale(value),
-        y: -Math.cos((value - this.min) * this.degrees + rotateRadians) * this.handScale(value),
+        y: -Math.cos((value - this.min) * this.degrees + rotateRadians) * this.handScale(value)
       }
     },
     onMouseDown (e: MouseEvent | TouchEvent) {
@@ -239,7 +232,7 @@ export default mixins<options &
     angle (center: Point, p1: Point) {
       const value = 2 * Math.atan2(p1.y - center.y - this.euclidean(center, p1), p1.x - center.x)
       return Math.abs(value * 180 / Math.PI)
-    },
+    }
   },
 
   render (): VNode {
@@ -248,8 +241,8 @@ export default mixins<options &
         'v-time-picker-clock',
         {
           'v-time-picker-clock--indeterminate': this.modelValue == null,
-          ...this.themeClasses,
-        },
+          ...this.themeClasses
+        }
       ],
       onMousedown: (this.readonly || this.disabled) ? undefined : this.onMouseDown,
       onMouseup: (this.readonly || this.disabled) ? undefined : this.onMouseUp,
@@ -258,7 +251,7 @@ export default mixins<options &
       onTouchend: (this.readonly || this.disabled) ? undefined : this.onMouseUp,
       onMousemove: (this.readonly || this.disabled) ? undefined : this.onDragMove,
       onTouchmove: (this.readonly || this.disabled) ? undefined : this.onDragMove,
-      ref: 'clock',
+      ref: 'clock'
     }
 
     if (this.scrollable && !this.readonly && !this.disabled) {
@@ -268,11 +261,11 @@ export default mixins<options &
     return h('div', data, [
       h('div', {
         class: 'v-time-picker-clock__inner',
-        ref: 'innerClock',
+        ref: 'innerClock'
       }, [
         this.genHand(),
-        this.genValues(),
-      ]),
+        this.genValues()
+      ])
     ])
-  },
+  }
 })

package/src/components/VTimePicker/VTimePickerTitle.ts

@@ -25,11 +25,11 @@ export default mixins(
     second: Number,
     period: {
       type: String as PropType<'am' | 'pm'>,
-      validator: period => period === 'am' || period === 'pm',
+      validator: period => period === 'am' || period === 'pm'
     },
     readonly: Boolean,
     useSeconds: Boolean,
-    selecting: Number,
+    selecting: Number
   },
 
   emits: ['update:selecting', 'update:period'],
@@ -46,7 +46,7 @@ export default mixins(
       const titleContent = [
         this.genPickerButton('selecting', SelectingTimes.Hour, displayedHour, this.disabled),
         h('span', ':'),
-        this.genPickerButton('selecting', SelectingTimes.Minute, displayedMinute, this.disabled),
+        this.genPickerButton('selecting', SelectingTimes.Minute, displayedMinute, this.disabled)
       ]
 
       if (this.useSeconds) {
@@ -55,20 +55,20 @@ export default mixins(
         titleContent.push(this.genPickerButton('selecting', SelectingTimes.Second, displayedSecond, this.disabled))
       }
       return h('div', {
-        class: 'v-time-picker-title__time',
+        class: 'v-time-picker-title__time'
       }, titleContent)
     },
     genAmPm () {
       return h('div', {
         class: {
           'v-time-picker-title__ampm': true,
-          'v-time-picker-title__ampm--readonly': this.ampmReadonly,
-        },
+          'v-time-picker-title__ampm--readonly': this.ampmReadonly
+        }
       }, [
         (!this.ampmReadonly || this.period === 'am') ? this.genPickerButton('period', 'am', this.$vuetify.lang.t('$vuetify.timePicker.am'), this.disabled || this.readonly) : null,
-        (!this.ampmReadonly || this.period === 'pm') ? this.genPickerButton('period', 'pm', this.$vuetify.lang.t('$vuetify.timePicker.pm'), this.disabled || this.readonly) : null,
+        (!this.ampmReadonly || this.period === 'pm') ? this.genPickerButton('period', 'pm', this.$vuetify.lang.t('$vuetify.timePicker.pm'), this.disabled || this.readonly) : null
       ])
-    },
+    }
   },
 
   render (): VNode {
@@ -77,7 +77,7 @@ export default mixins(
     this.ampm && children.push(this.genAmPm())
 
     return h('div', {
-      class: 'v-time-picker-title',
+      class: 'v-time-picker-title'
     }, children)
-  },
+  }
 })