@dimailn/vuetify 2.7.2-alpha40 → 2.7.2-alpha42

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

@@ -1,45 +1,45 @@
-import intersectable from "../index";
-import { defineComponent, h } from "vue";
-import { mount, VueWrapper } from "@vue/test-utils";
+import intersectable from '../index'
+import { defineComponent, h } from 'vue'
+import { mount, VueWrapper } from '@vue/test-utils'
 
-describe("intersectable.ts", () => {
-  let mountFunction: (options?: any) => VueWrapper<any>;
+describe('intersectable.ts', () => {
+  let mountFunction: (options?: any) => VueWrapper<any>
 
   beforeEach(() => {
     mountFunction = (options?: any) => {
       return mount(
         defineComponent({
-          render: () => h("div"),
+          render: () => h('div'),
           ...options
         })
-      );
-    };
-  });
+      )
+    }
+  })
 
-  it("should call callbacks when element is intersected", () => {
-    const callback = jest.fn();
+  it('should call callbacks when element is intersected', () => {
+    const callback = jest.fn()
 
     const wrapper = mountFunction({
-      mixins: [intersectable({ onVisible: ["callback"] })],
+      mixins: [intersectable({ onVisible: ['callback'] })],
       methods: { callback }
-    });
+    })
 
-    expect(callback).not.toHaveBeenCalled();
+    expect(callback).not.toHaveBeenCalled()
 
     wrapper.vm.onObserve(
       [] as IntersectionObserverEntry[],
       (null as any) as IntersectionObserver,
       false
-    );
+    )
 
-    expect(callback).not.toHaveBeenCalled();
+    expect(callback).not.toHaveBeenCalled()
 
     wrapper.vm.onObserve(
       [] as IntersectionObserverEntry[],
       (null as any) as IntersectionObserver,
       true
-    );
+    )
 
-    expect(callback).toHaveBeenCalledTimes(1);
-  });
-});
+    expect(callback).toHaveBeenCalledTimes(1)
+  })
+})

package/src/mixins/intersectable/index.ts

@@ -5,30 +5,30 @@ import Intersect from '../../directives/intersect'
 import { consoleWarn } from '../../util/console'
 
 // Types
-import {defineComponent, getCurrentInstance} from 'vue'
+import { defineComponent, getCurrentInstance } from 'vue'
 
 export default function intersectable (options: { onVisible: string[] }) {
   return defineComponent({
     name: 'intersectable',
 
     data: () => ({
-      isIntersecting: false,
+      isIntersecting: false
     }),
 
     mounted () {
-      const {vnode} = getCurrentInstance()
-      Intersect.mounted(this.$el as HTMLElement, {
+      const { vnode } = getCurrentInstance()
+      ;(Intersect.mounted as any)(this.$el as HTMLElement, {
         name: 'intersect',
-        value: this.onObserve,
+        value: this.onObserve
       }, vnode)
     },
 
     unmounted () {
-      const {vnode} = getCurrentInstance()
+      const { vnode } = getCurrentInstance()
 
-      Intersect.unmounted(this.$el as HTMLElement, {
+      ;(Intersect.unmounted as any)(this.$el as HTMLElement, {
         name: 'intersect',
-        value: this.onObserve,
+        value: this.onObserve
       }, vnode)
     },
 
@@ -48,7 +48,7 @@ export default function intersectable (options: { onVisible: string[] }) {
 
           consoleWarn(options.onVisible[i] + ' method is not available on the instance but referenced in intersectable mixin options')
         }
-      },
-    },
+      }
+    }
   })
 }

package/src/mixins/loadable/index.ts

@@ -22,26 +22,28 @@ export default defineComponent({
   props: {
     loading: {
       type: [Boolean, String],
-      default: false,
+      default: false
     },
     loaderHeight: {
       type: [Number, String],
-      default: 2,
-    },
+      default: 2
+    }
   },
 
   methods: {
     genProgress (): VNode | VNode[] | null {
       if (this.loading === false) return null
 
-      return getSlot(this, 'progress') || h(VProgressLinear, {
+      const progress = getSlot(this, 'progress')
+      if (progress != null) return progress as VNode | VNode[]
+      return h(VProgressLinear, {
         absolute: true,
         color: (this.loading === true || this.loading === '')
           ? (this.color || 'primary')
           : this.loading,
         height: this.loaderHeight,
-        indeterminate: true,
+        indeterminate: true
       })
-    },
-  },
+    }
+  }
 })

package/src/mixins/localable/index.ts

@@ -1,15 +1,15 @@
-import {defineComponent} from 'vue'
+import { defineComponent } from 'vue'
 
 export default defineComponent({
   name: 'localable',
 
   props: {
-    locale: String,
+    locale: String
   },
 
   computed: {
     currentLocale (): string {
       return this.locale || this.$vuetify.lang.current
-    },
-  },
+    }
+  }
 })

package/src/mixins/measurable/index.ts

@@ -15,7 +15,7 @@ export default defineComponent({
     maxWidth: [Number, String] as NumberOrNumberString,
     minHeight: [Number, String] as NumberOrNumberString,
     minWidth: [Number, String] as NumberOrNumberString,
-    width: [Number, String] as NumberOrNumberString,
+    width: [Number, String] as NumberOrNumberString
   },
 
   computed: {
@@ -37,6 +37,6 @@ export default defineComponent({
       if (width) styles.width = width
 
       return styles
-    },
-  },
+    }
+  }
 })

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

@@ -8,7 +8,7 @@ describe('menuable.ts', () => {
     mixins: [Menuable],
     render () {
       return h('div')
-    },
+    }
   })
 
   type Instance = InstanceType<typeof Mock>;
@@ -21,11 +21,11 @@ describe('menuable.ts', () => {
           mocks: {
             $vuetify: {
               theme: {},
-              rtl: false,
-            },
-          },
+              rtl: false
+            }
+          }
         },
-        ...options,
+        ...options
       })
     }
   })
@@ -34,8 +34,8 @@ describe('menuable.ts', () => {
     const wrapper = mountFunction({
       attachTo: document.body,
       props: {
-        activator: 'body',
-      },
+        activator: 'body'
+      }
     })
 
     expect(wrapper.vm.getActivator()).toBeTruthy()
@@ -46,11 +46,11 @@ describe('menuable.ts', () => {
     const MockWithMethod = defineComponent({
       mixins: [Menuable],
       methods: {
-        sneakPeek,
+        sneakPeek
       },
       render () {
         return h('div')
-      },
+      }
     })
 
     const wrapper = mount(MockWithMethod, {
@@ -58,10 +58,10 @@ describe('menuable.ts', () => {
         mocks: {
           $vuetify: {
             theme: {},
-            rtl: false,
-          },
-        },
-      },
+            rtl: false
+          }
+        }
+      }
     })
 
     wrapper.vm.updateDimensions()
@@ -75,8 +75,8 @@ describe('menuable.ts', () => {
         attach: true,
         left: true,
         offsetX: true,
-        maxWidth: 200,
-      },
+        maxWidth: 200
+      }
     })
 
     // Настраиваем размеры для правильного тестирования
@@ -84,11 +84,11 @@ describe('menuable.ts', () => {
       activator: {
         width: 100,
         offsetLeft: 0,
-        left: 0,
+        left: 0
       },
       content: {
-        width: 300,
-      },
+        width: 300
+      }
     }
 
     // Мокаем pageWidth для создания сценария переполнения
@@ -109,10 +109,10 @@ describe('menuable.ts', () => {
           VApp,
           {},
           {
-            default: () => h(Mock),
+            default: () => h(Mock)
           }
         )
-      },
+      }
     })
 
     const wrapper = mount(AppComponent, {
@@ -120,10 +120,10 @@ describe('menuable.ts', () => {
         mocks: {
           $vuetify: {
             theme: {},
-            rtl: false,
-          },
-        },
-      },
+            rtl: false
+          }
+        }
+      }
     })
 
     await wrapper.vm.$nextTick()

package/src/mixins/menuable/index.ts

@@ -15,7 +15,7 @@ const baseMixins = mixins(
   Stackable,
   positionableFactory(['top', 'right', 'bottom', 'left', 'absolute']),
   Activatable,
-  Detachable,
+  Detachable
 )
 
 interface dimensions {
@@ -30,7 +30,7 @@ interface dimensions {
   offsetLeft: number
 }
 
-interface options extends ExtractVue<typeof baseMixins> {
+type options = ExtractVue<typeof baseMixins> & {
   attach: boolean | string | Element
   offsetY: boolean
   offsetX: boolean
@@ -54,42 +54,42 @@ export default baseMixins.extend({
     dark: Boolean,
     maxWidth: {
       type: [Number, String],
-      default: 'auto',
+      default: 'auto'
     },
     minWidth: [Number, String],
     nudgeBottom: {
       type: [Number, String],
-      default: 0,
+      default: 0
     },
     nudgeLeft: {
       type: [Number, String],
-      default: 0,
+      default: 0
     },
     nudgeRight: {
       type: [Number, String],
-      default: 0,
+      default: 0
     },
     nudgeTop: {
       type: [Number, String],
-      default: 0,
+      default: 0
     },
     nudgeWidth: {
       type: [Number, String],
-      default: 0,
+      default: 0
     },
     offsetOverflow: Boolean,
     positionX: {
       type: Number,
-      default: null,
+      default: null
     },
     positionY: {
       type: Number,
-      default: null,
+      default: null
     },
     zIndex: {
       type: [Number, String],
-      default: null,
-    },
+      default: null
+    }
   },
 
   data: () => ({
@@ -108,7 +108,7 @@ export default baseMixins.extend({
         height: 0,
         offsetTop: 0,
         scrollHeight: 0,
-        offsetLeft: 0,
+        offsetLeft: 0
       },
       content: {
         top: 0,
@@ -118,8 +118,8 @@ export default baseMixins.extend({
         width: 0,
         height: 0,
         offsetTop: 0,
-        scrollHeight: 0,
-      },
+        scrollHeight: 0
+      }
     },
     relativeYOffset: 0,
     hasJustFocused: false,
@@ -129,11 +129,11 @@ export default baseMixins.extend({
     pageWidth: 0,
     pageYOffset: 0,
     stackClass: 'v-menu__content--active',
-    stackMinZIndex: 6,
+    stackMinZIndex: 6
   }),
 
   computed: {
-    isMenuable() {
+    isMenuable () {
       return true
     },
     computedLeft () {
@@ -171,11 +171,11 @@ export default baseMixins.extend({
       return top
     },
     hasActivator (): boolean {
-      return !!this.$slots.activator || !!this.$slots.activator || !!this.activator || !!this.inputActivator
+      return !!this.$slots.activator || !!this.activator || !!this.inputActivator
     },
     absoluteYOffset (): number {
       return this.pageYOffset - this.relativeYOffset
-    },
+    }
   },
 
   watch: {
@@ -188,7 +188,7 @@ export default baseMixins.extend({
       val ? this.callActivate() : this.callDeactivate()
     },
     positionX: 'updateDimensions',
-    positionY: 'updateDimensions',
+    positionY: 'updateDimensions'
   },
 
   beforeMount () {
@@ -216,7 +216,7 @@ export default baseMixins.extend({
         left: this.positionX || this.absoluteX,
         right: this.positionX || this.absoluteX,
         height: 0,
-        width: 0,
+        width: 0
       }
     },
     activate () {},
@@ -307,7 +307,7 @@ export default baseMixins.extend({
       if (onClick) {
         listeners.onClick = (e: MouseEvent & KeyboardEvent & FocusEvent) => {
           if (this.openOnClick) {
-            onClick && onClick(e)
+            onClick(e)
           }
 
           this.absoluteX = e.clientX
@@ -343,7 +343,7 @@ export default baseMixins.extend({
         bottom: Math.round(rect.bottom),
         right: Math.round(rect.right),
         width: Math.round(rect.width),
-        height: Math.round(rect.height),
+        height: Math.round(rect.height)
       }
     },
     measure (el: HTMLElement) {
@@ -389,7 +389,7 @@ export default baseMixins.extend({
 
       const dimensions: any = {
         activator: { ...this.dimensions.activator },
-        content: { ...this.dimensions.content },
+        content: { ...this.dimensions.content }
       }
 
       // Activator should already be shown
@@ -426,6 +426,6 @@ export default baseMixins.extend({
 
         this.dimensions = dimensions
       })
-    },
-  },
+    }
+  }
 })

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

@@ -17,7 +17,7 @@ describe('mobile.ts', () => {
   beforeEach(() => {
     const Mock = defineComponent({
       mixins: [Mobile],
-      render: () => h('div'),
+      render: () => h('div')
     })
 
     mountFunction = (options = {}) => {
@@ -25,9 +25,9 @@ describe('mobile.ts', () => {
         ...options,
         global: {
           mocks: {
-            $vuetify: { breakpoint: new Breakpoint(preset) },
-          },
-        },
+            $vuetify: { breakpoint: new Breakpoint(preset) }
+          }
+        }
       })
     }
   })
@@ -37,18 +37,18 @@ describe('mobile.ts', () => {
     [1263, 1264, true],
     [1263, 'xl', false],
     [1920, 'md', false],
-    [1263, 1400, true],
+    [1263, 1400, true]
   ])('should conditionally be mobile using a breakpoint of %s', async (...item) => {
     const [
       resizeTo,
       mobileBreakpoint,
-      isMobile,
+      isMobile
     ] = item
 
     await resizeWindow(resizeTo as number)
 
     const wrapper = mountFunction({
-      props: { mobileBreakpoint },
+      props: { mobileBreakpoint }
     })
 
     expect(wrapper.vm.isMobile).toBe(isMobile)

package/src/mixins/mobile/index.ts

@@ -13,22 +13,22 @@ export default defineComponent({
       validator: v => (
         !isNaN(Number(v)) ||
         ['xs', 'sm', 'md', 'lg', 'xl'].includes(String(v))
-      ),
-    },
+      )
+    }
   },
 
   computed: {
-    $mobileBreakpoint() {
+    $mobileBreakpoint () {
       return this.mobileBreakpoint || (this.$vuetify
-      ? this.$vuetify.breakpoint.mobileBreakpoint
-      : undefined)
+        ? this.$vuetify.breakpoint.mobileBreakpoint
+        : undefined)
     },
     isMobile (): boolean {
       const {
         mobile,
         width,
         name,
-        mobileBreakpoint,
+        mobileBreakpoint
       } = this.$vuetify.breakpoint
 
       // Check if local mobileBreakpoint matches
@@ -41,7 +41,7 @@ export default defineComponent({
       return isNumber
         ? width < mobileWidth
         : name === this.$mobileBreakpoint
-    },
+    }
   },
 
   created () {
@@ -49,5 +49,5 @@ export default defineComponent({
     if (this.$attrs.hasOwnProperty('mobile-break-point')) {
       deprecate('mobile-break-point', 'mobile-breakpoint', this)
     }
-  },
+  }
 })

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

@@ -3,13 +3,13 @@ import Mouse from '../index'
 import {
   mount,
   VueWrapper,
-  MountingOptions,
+  MountingOptions
 } from '@vue/test-utils'
 import { ComponentPublicInstance, h, defineComponent } from 'vue'
 
 const Mock = defineComponent({
   mixins: [Mouse],
-  render: () => h('div'),
+  render: () => h('div')
 })
 
 describe('mouse.ts', () => {
@@ -26,8 +26,8 @@ describe('mouse.ts', () => {
     const noop = (e: any) => e
     const wrapper = mount(Mock, {
       attrs: {
-        onClick: noop,
-      },
+        onClick: noop
+      }
     })
 
     const handlers = wrapper.vm.getMouseEventHandlers({ click: { event: 'click' } }, noop)
@@ -38,8 +38,8 @@ describe('mouse.ts', () => {
     const noop = (e: any) => e
     const wrapper = mount(Mock, {
       attrs: {
-        'onClick:foo': noop,
-      },
+        'onClick:foo': noop
+      }
     })
 
     const handlers = wrapper.vm.getDefaultMouseEventHandlers(':foo', noop)
@@ -54,8 +54,8 @@ describe('mouse.ts', () => {
         onMouseleave: noop,
         onMousedown: noop,
         onMouseup: noop,
-        onMousemove: noop,
-      },
+        onMousemove: noop
+      }
     })
     const emptySuffixHandlers = wrapper2.vm.getDefaultMouseEventHandlers('', noop)
     expect(Object.keys(emptySuffixHandlers)).toHaveLength(6)
@@ -64,8 +64,8 @@ describe('mouse.ts', () => {
   it('should emit events', async () => {
     const wrapper = mount(Mock, {
       attrs: {
-        onClick: () => {},
-      },
+        onClick: () => {}
+      }
     })
 
     const handlers = wrapper.vm.getMouseEventHandlers({ click: { event: 'click' } }, () => ({}))
@@ -77,8 +77,8 @@ describe('mouse.ts', () => {
   it('should handle prevent modifier', async () => {
     const wrapper = mount(Mock, {
       attrs: {
-        onClick: () => {},
-      },
+        onClick: () => {}
+      }
     })
     const event = { preventDefault: jest.fn() } as unknown as MouseEvent
 
@@ -91,8 +91,8 @@ describe('mouse.ts', () => {
   it('should handle stop modifier', async () => {
     const wrapper = mount(Mock, {
       attrs: {
-        onClick: () => {},
-      },
+        onClick: () => {}
+      }
     })
     const event = { stopPropagation: jest.fn() } as unknown as MouseEvent
 

package/src/mixins/mouse/index.ts

@@ -41,7 +41,7 @@ export default defineComponent({
 
       return this.getMouseEventHandlers({
         ...listeners,
-        ['contextmenu' + suffix]: { event: 'contextmenu', prevent: true, result: false },
+        ['contextmenu' + suffix]: { event: 'contextmenu', prevent: true, result: false }
       }, getData, eventFirst)
     },
     getMouseEventHandlers (events: MouseEvents, getData: MouseHandler, eventFirst = false): MouseEventsMap {
@@ -88,7 +88,7 @@ export default defineComponent({
                 currentTarget.dispatchEvent(new TouchEvent(e.type, {
                   changedTouches: e.changedTouches as unknown as Touch[],
                   targetTouches: e.targetTouches as unknown as Touch[],
-                  touches: e.touches as unknown as Touch[],
+                  touches: e.touches as unknown as Touch[]
                 }))
                 return
               }
@@ -119,6 +119,6 @@ export default defineComponent({
       }
 
       return on
-    },
-  },
+    }
+  }
 })