@dimailn/vuetify 2.7.2-alpha40 → 2.7.2-alpha42

package/src/mixins/routable/index.ts

@@ -1,4 +1,6 @@
-import { VNodeData, PropType, defineComponent, resolveComponent } from 'vue'
+import type { VNodeData } from '../../types/vue-internal'
+import type { PropType } from 'vue'
+import { defineComponent, resolveComponent } from 'vue'
 
 // Directives
 import Ripple, { RippleOptions } from '../../directives/ripple'
@@ -10,7 +12,7 @@ export default defineComponent({
   name: 'routable',
 
   directives: {
-    Ripple,
+    Ripple
   },
 
   props: {
@@ -19,7 +21,7 @@ export default defineComponent({
     disabled: Boolean,
     exact: {
       type: Boolean as PropType<boolean | undefined>,
-      default: undefined,
+      default: undefined
     },
     exactPath: Boolean,
     exactActiveClass: String,
@@ -30,7 +32,7 @@ export default defineComponent({
     replace: Boolean,
     ripple: {
       type: [Boolean, Object],
-      default: null,
+      default: null
     },
     tag: String,
     target: String,
@@ -39,7 +41,7 @@ export default defineComponent({
 
   data: () => ({
     isActive: false,
-    proxyClass: '',
+    proxyClass: ''
   }),
 
   computed: {
@@ -60,26 +62,26 @@ export default defineComponent({
       return this.ripple ?? (!this.disabled && this.isClickable)
     },
     isClickable (): boolean {
-      if(this.notALink) return false
+      if (this.notALink) return false
 
       if (this.disabled) return false
 
       return Boolean(
         this.isLink ||
         this.$attrs.onClick ||
-        this.$attrs["on!click"] ||
+        this.$attrs['on!click'] ||
         this.$attrs.tabindex ||
         this.$props?.onClick
-      );
+      )
     },
     isLink (): boolean {
       return this.to || this.href || this.link
     },
-    styles: () => ({}),
+    styles: () => ({})
   },
 
   watch: {
-    $route: 'onRouteChange',
+    $route: 'onRouteChange'
   },
 
   mounted () {
@@ -93,7 +95,7 @@ export default defineComponent({
 
       const directives = [[
         Ripple,
-        this.computedRipple,
+        this.computedRipple
       ]]
 
       const data: VNodeData = {
@@ -129,7 +131,7 @@ export default defineComponent({
           activeClass,
           exactActiveClass,
           append: this.append,
-          replace: this.replace,
+          replace: this.replace
         })
       } else {
         tag = (this.href && 'a') || this.tag || 'div'
@@ -157,6 +159,6 @@ export default defineComponent({
     },
     toggle () {
       this.isActive = !this.isActive
-    },
-  },
+    }
+  }
 })

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

@@ -16,9 +16,9 @@ describe('Scrollable.ts', () => {
       ...options,
       render () {
         return h('div', {
-          onScroll: this.onScroll,
+          onScroll: this.onScroll
         })
-      },
+      }
     })
   }
 
@@ -26,7 +26,7 @@ describe('Scrollable.ts', () => {
     const Mock = createMockComponent()
     mountFunction = (options = {}) => {
       return mount(Mock, {
-        ...options,
+        ...options
       })
     }
   })
@@ -50,8 +50,8 @@ describe('Scrollable.ts', () => {
   it('should set a custom target', async () => {
     const wrapper = mountFunction({
       props: {
-        scrollTarget: 'body',
-      },
+        scrollTarget: 'body'
+      }
     })
 
     wrapper.vm.onScroll()
@@ -63,14 +63,14 @@ describe('Scrollable.ts', () => {
       data () {
         return {
           currentScroll: 100,
-          previousScroll: 0,
+          previousScroll: 0
         }
       },
       computed: {
         canScroll () {
           return false
-        },
-      },
+        }
+      }
     })
 
     await scrollWindow(1000)
@@ -88,18 +88,18 @@ describe('Scrollable.ts', () => {
       props: {
         scrollThreshold: {
           type: Number,
-          default: 300,
-        },
+          default: 300
+        }
       },
       methods: {
-        thresholdMet,
-      },
+        thresholdMet
+      }
     })
 
     const wrapper = mount(MockWithThreshold, {
       props: {
-        scrollThreshold: 1000,
-      },
+        scrollThreshold: 1000
+      }
     })
 
     // Скроллим меньше порога
@@ -120,9 +120,9 @@ describe('Scrollable.ts', () => {
     const wrapper = mountFunction({
       data () {
         return {
-          savedScroll: 100,
+          savedScroll: 100
         }
-      },
+      }
     })
 
     // В Vue 3 используем прямое изменение данных
@@ -135,8 +135,8 @@ describe('Scrollable.ts', () => {
   it(`should warn if target isn't present`, async () => {
     mountFunction({
       props: {
-        scrollTarget: '#test',
-      },
+        scrollTarget: '#test'
+      }
     })
 
     expect('Unable to locate element with identifier #test').toHaveBeenTipped()

package/src/mixins/scrollable/index.ts

@@ -5,7 +5,7 @@ import { Scroll } from '../../directives'
 import { consoleWarn } from '../../util/console'
 
 // Types
-import {defineComponent} from 'vue'
+import { defineComponent } from 'vue'
 
 /**
  * Scrollable
@@ -23,7 +23,7 @@ export default defineComponent({
 
   props: {
     scrollTarget: String,
-    scrollThreshold: [String, Number],
+    scrollThreshold: [String, Number]
   },
 
   data: () => ({
@@ -33,7 +33,7 @@ export default defineComponent({
     isScrollingUp: false,
     previousScroll: 0,
     savedScroll: 0,
-    target: null as Element | null,
+    target: null as Element | null
   }),
 
   computed: {
@@ -53,7 +53,7 @@ export default defineComponent({
       return this.scrollThreshold
         ? Number(this.scrollThreshold)
         : 300
-    },
+    }
   },
 
   watch: {
@@ -62,7 +62,7 @@ export default defineComponent({
     },
     isActive () {
       this.savedScroll = 0
-    },
+    }
   },
 
   mounted () {
@@ -99,6 +99,6 @@ export default defineComponent({
      * scrolling in any direction
      * has exceeded the threshold
      */
-    thresholdMet () { /* noop */ },
-  },
+    thresholdMet () { /* noop */ }
+  }
 })

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

@@ -6,14 +6,14 @@ import {
   mount,
   VueWrapper,
   MountingOptions,
-  enableAutoUnmount,
+  enableAutoUnmount
 } from '@vue/test-utils'
 import { ComponentPublicInstance, h, defineComponent } from 'vue'
 
 describe('Selectable.ts', () => {
   const Mock = defineComponent({
     mixins: [Selectable],
-    render: () => h('div'),
+    render: () => h('div')
   })
 
   type Instance = ComponentPublicInstance & InstanceType<typeof Mock>
@@ -24,7 +24,7 @@ describe('Selectable.ts', () => {
   beforeEach(() => {
     mountFunction = (options = {}) => {
       return mount(Mock, {
-        ...options,
+        ...options
       })
     }
   })
@@ -44,8 +44,8 @@ describe('Selectable.ts', () => {
   it('should handle disabled state', async () => {
     const wrapper = mountFunction({
       props: {
-        disabled: true,
-      },
+        disabled: true
+      }
     })
 
     expect(wrapper.vm.rippleState).toBeUndefined()

package/src/mixins/selectable/index.ts

@@ -28,19 +28,19 @@ export default mixins(
     trueValue: null as any,
     multiple: {
       type: Boolean,
-      default: null,
+      default: null
     },
-    label: String,
+    label: String
   },
 
   data () {
     return {
       hasColor: this.modelValue,
-      lazyValue: this.modelValue,
+      lazyValue: this.modelValue
     }
   },
 
-  created() {
+  created () {
     this.$_emitChangeEvent = true
   },
 
@@ -79,14 +79,14 @@ export default mixins(
       return !this.isDisabled && !this.validationState
         ? undefined
         : this.validationState
-    },
+    }
   },
 
   watch: {
     modelValue (val) {
       this.lazyValue = val
       this.hasColor = val
-    },
+    }
   },
 
   methods: {
@@ -107,7 +107,7 @@ export default mixins(
         disabled: this.isDisabled,
         id: this.computedId,
         role: type,
-        type,
+        type
       }
 
       return h('input', {
@@ -166,6 +166,6 @@ export default mixins(
       this.$emit('blur', e)
     },
     /** @abstract */
-    onKeydown (e: Event) {},
-  },
+    onKeydown (e: Event) {}
+  }
 })

package/src/mixins/sizeable/index.ts

@@ -1,4 +1,4 @@
-import {defineComponent} from 'vue'
+import { defineComponent } from 'vue'
 
 export default defineComponent({
   name: 'sizeable',
@@ -7,7 +7,7 @@ export default defineComponent({
     large: Boolean,
     small: Boolean,
     xLarge: Boolean,
-    xSmall: Boolean,
+    xSmall: Boolean
   },
 
   computed: {
@@ -25,8 +25,8 @@ export default defineComponent({
         'v-size--small': this.small,
         'v-size--default': this.medium,
         'v-size--large': this.large,
-        'v-size--x-large': this.xLarge,
+        'v-size--x-large': this.xLarge
       }
-    },
-  },
+    }
+  }
 })

package/src/mixins/ssr-bootable/index.ts

@@ -1,4 +1,4 @@
-import {defineComponent} from 'vue'
+import { defineComponent } from 'vue'
 
 /**
  * SSRBootable
@@ -12,7 +12,7 @@ export default defineComponent({
   name: 'ssr-bootable',
 
   data: () => ({
-    isBooted: false,
+    isBooted: false
   }),
 
   mounted () {
@@ -23,5 +23,5 @@ export default defineComponent({
       this.$el.setAttribute('data-booted', 'true')
       this.isBooted = true
     })
-  },
+  }
 })

package/src/mixins/stackable/index.ts

@@ -1,4 +1,4 @@
-import {defineComponent} from 'vue'
+import { defineComponent } from 'vue'
 
 import { getZIndex } from '../../util/helpers'
 
@@ -17,7 +17,7 @@ export default defineComponent({
       stackElement: null as Element | null,
       stackExclude: null as Element[] | null,
       stackMinZIndex: 0,
-      isActive: false,
+      isActive: false
     }
   },
   computed: {
@@ -36,7 +36,7 @@ export default defineComponent({
       // Return max current z-index (excluding self) + 2
       // (2 to leave room for an overlay below, if needed)
       return parseInt(index)
-    },
+    }
   },
   methods: {
     getMaxZIndex (exclude: Element[] = []) {
@@ -49,7 +49,7 @@ export default defineComponent({
       // https://github.com/vuetifyjs/vuetify/issues/2146
       const activeElements = [
         ...document.getElementsByClassName('v-menu__content--active'),
-        ...document.getElementsByClassName('v-dialog__content--active'),
+        ...document.getElementsByClassName('v-dialog__content--active')
       ]
 
       // Get z-index for all active dialogs
@@ -60,6 +60,6 @@ export default defineComponent({
       }
 
       return Math.max(...zis)
-    },
-  },
+    }
+  }
 })

package/src/mixins/themeable/index.ts

@@ -1,5 +1,5 @@
-import {defineComponent, App} from 'vue'
-import { PropType, RenderContext } from 'vue/types/options'
+import { defineComponent, App } from 'vue'
+import type { PropType } from 'vue'
 
 interface options extends App {
   theme: {
@@ -13,34 +13,34 @@ const Themeable = defineComponent({
 
   provide (): object {
     return {
-      theme: this.themeableProvide,
+      theme: this.themeableProvide
     }
   },
 
   inject: {
     theme: {
       default: {
-        isDark: false,
-      },
-    },
+        isDark: false
+      }
+    }
   },
 
   props: {
     dark: {
       type: Boolean as PropType<boolean | null>,
-      default: null,
+      default: null
     },
     light: {
       type: Boolean as PropType<boolean | null>,
-      default: null,
-    },
+      default: null
+    }
   },
 
   data () {
     return {
       themeableProvide: {
-        isDark: false,
-      },
+        isDark: false
+      }
     }
   },
 
@@ -63,7 +63,7 @@ const Themeable = defineComponent({
     themeClasses (): object {
       return {
         'theme--dark': this.isDark,
-        'theme--light': !this.isDark,
+        'theme--light': !this.isDark
       }
     },
     /** Used by menus and dialogs, inherits from v-app instead of the parent */
@@ -82,9 +82,9 @@ const Themeable = defineComponent({
     rootThemeClasses (): Dictionary<boolean> {
       return {
         'theme--dark': this.rootIsDark,
-        'theme--light': !this.rootIsDark,
+        'theme--light': !this.rootIsDark
       }
-    },
+    }
   },
 
   watch: {
@@ -94,9 +94,9 @@ const Themeable = defineComponent({
           this.themeableProvide.isDark = this.isDark
         }
       },
-      immediate: true,
-    },
-  },
+      immediate: true
+    }
+  }
 })
 
 export default Themeable

package/src/mixins/toggleable/index.ts

@@ -1,18 +1,18 @@
 import { defineComponent, Component } from 'vue'
 
-export type Toggleable<T extends string = 'value'> = Component<Vue & { isActive: boolean } & Record<T, any>>
+export type Toggleable<T extends string = 'value'> = Component
 
 export function factory<T extends string = 'value'> (prop?: T, event?: string): Toggleable<T>
 export function factory (prop = 'modelValue', event = 'update:modelValue') {
   return defineComponent({
     name: 'toggleable',
     props: {
-      [prop]: { required: false },
+      [prop]: { required: false }
     },
 
     data () {
       return {
-        isActive: !!this[prop],
+        isActive: !!this[prop]
       }
     },
 
@@ -22,8 +22,8 @@ export function factory (prop = 'modelValue', event = 'update:modelValue') {
       },
       isActive (val) {
         !!val !== this[prop] && this.$emit(event, val)
-      },
-    },
+      }
+    }
   })
 }
 

package/src/mixins/transitionable/index.ts

@@ -1,4 +1,4 @@
-import {defineComponent} from 'vue'
+import { defineComponent } from 'vue'
 
 export default defineComponent({
   name: 'transitionable',
@@ -6,6 +6,6 @@ export default defineComponent({
   props: {
     mode: String,
     origin: String,
-    transition: String,
-  },
+    transition: String
+  }
 })

package/src/mixins/translatable/index.ts

@@ -1,10 +1,10 @@
-import {defineComponent} from 'vue'
+import { defineComponent } from 'vue'
 
 export default defineComponent({
   name: 'translatable',
 
   props: {
-    height: Number,
+    height: Number
   },
 
   data: () => ({
@@ -14,13 +14,13 @@ export default defineComponent({
     percentScrolled: 0,
     scrollTop: 0,
     windowHeight: 0,
-    windowBottom: 0,
+    windowBottom: 0
   }),
 
   computed: {
     imgHeight (): number {
       return this.objHeight()
-    },
+    }
   },
 
   beforeUnmount () {
@@ -55,6 +55,6 @@ export default defineComponent({
       )
 
       this.parallax = Math.round(this.parallaxDist * this.percentScrolled)
-    },
-  },
+    }
+  }
 })