vuetify 2.6.0-beta.0 → 2.6.0

package/src/directives/mutate/index.ts

@@ -1,4 +1,4 @@
-import { VNodeDirective } from 'vue'
+import { VNode, VNodeDirective } from 'vue'
 
 type MutateHandler = (
   mutationsList: MutationRecord[],
@@ -16,7 +16,7 @@ interface MutateVNodeDirective extends Omit<VNodeDirective, 'modifiers'> {
   }
 }
 
-function inserted (el: HTMLElement, binding: MutateVNodeDirective) {
+function inserted (el: HTMLElement, binding: MutateVNodeDirective, vnode: VNode) {
   const modifiers = binding.modifiers || {}
   const value = binding.value
   const callback = typeof value === 'object' ? value.handler : value!
@@ -52,19 +52,19 @@ function inserted (el: HTMLElement, binding: MutateVNodeDirective) {
     callback(mutationsList, observer)
 
     // If has the once modifier, unbind
-    once && unbind(el)
+    once && unbind(el, binding, vnode)
   })
 
   observer.observe(el, options)
-  el._mutate = { observer }
+  el._mutate = Object(el._mutate)
+  el._mutate![vnode.context!._uid] = { observer }
 }
 
-function unbind (el: HTMLElement) {
-  /* istanbul ignore if */
-  if (!el._mutate) return
+function unbind (el: HTMLElement, binding: MutateVNodeDirective, vnode: VNode) {
+  if (!el._mutate?.[vnode.context!._uid]) return
 
-  el._mutate.observer.disconnect()
-  delete el._mutate
+  el._mutate[vnode.context!._uid]!.observer.disconnect()
+  delete el._mutate[vnode.context!._uid]
 }
 
 export const Mutate = {

package/src/directives/resize/__tests__/resize.spec.ts

@@ -8,10 +8,10 @@ describe('resize.ts', () => {
     jest.spyOn(window, 'removeEventListener')
     const el = {}
 
-    Resize.inserted(el as HTMLElement, { value: callback } as any)
+    Resize.inserted(el as HTMLElement, { value: callback } as any, { context: { _uid: 1 } } as any)
     expect(callback).toHaveBeenCalled()
     expect(window.addEventListener).toHaveBeenCalledWith('resize', callback, { passive: true })
-    Resize.unbind(el as HTMLElement)
+    Resize.unbind(el as HTMLElement, { value: callback } as any, { context: { _uid: 1 } } as any)
     expect(window.removeEventListener).toHaveBeenCalledWith('resize', callback, { passive: true })
   })
 
@@ -21,10 +21,10 @@ describe('resize.ts', () => {
     jest.spyOn(window, 'removeEventListener')
     const el = {}
 
-    Resize.inserted(el as HTMLElement, { value: callback, modifiers: { quiet: true } } as any)
+    Resize.inserted(el as HTMLElement, { value: callback, modifiers: { quiet: true } } as any, { context: { _uid: 1 } } as any)
     expect(callback).not.toHaveBeenCalled()
     expect(window.addEventListener).toHaveBeenCalledWith('resize', callback, { passive: true })
-    Resize.unbind(el as HTMLElement)
+    Resize.unbind(el as HTMLElement, { value: callback, modifiers: { quiet: true } } as any, { context: { _uid: 1 } } as any)
     expect(window.removeEventListener).toHaveBeenCalledWith('resize', callback, { passive: true })
   })
 })

package/src/directives/resize/index.ts

@@ -1,16 +1,19 @@
 import { VNodeDirective } from 'vue/types/vnode'
+import { VNode } from 'vue'
 
 interface ResizeVNodeDirective extends VNodeDirective {
   value?: () => void
   options?: boolean | AddEventListenerOptions
 }
 
-function inserted (el: HTMLElement, binding: ResizeVNodeDirective) {
+function inserted (el: HTMLElement, binding: ResizeVNodeDirective, vnode: VNode) {
   const callback = binding.value!
   const options = binding.options || { passive: true }
 
   window.addEventListener('resize', callback, options)
-  el._onResize = {
+
+  el._onResize = Object(el._onResize)
+  el._onResize![vnode.context!._uid] = {
     callback,
     options,
   }
@@ -20,12 +23,14 @@ function inserted (el: HTMLElement, binding: ResizeVNodeDirective) {
   }
 }
 
-function unbind (el: HTMLElement) {
-  if (!el._onResize) return
+function unbind (el: HTMLElement, binding: ResizeVNodeDirective, vnode: VNode) {
+  if (!el._onResize?.[vnode.context!._uid]) return
+
+  const { callback, options } = el._onResize[vnode.context!._uid]!
 
-  const { callback, options } = el._onResize
   window.removeEventListener('resize', callback, options)
-  delete el._onResize
+
+  delete el._onResize[vnode.context!._uid]
 }
 
 export const Resize = {

package/src/directives/scroll/__tests__/scroll.spec.ts

@@ -12,7 +12,7 @@ describe('scroll.ts', () => {
   let vnode
 
   beforeEach(() => {
-    vnode = null as any
+    vnode = { context: { _uid: 1 } } as any
     options = { passive: true }
     binding = {
       value: jest.fn(),
@@ -32,7 +32,7 @@ describe('scroll.ts', () => {
     inserted(el, binding, vnode, vnode)
 
     expect(spyOnWindowAddListener).toHaveBeenCalledWith('scroll', binding.value, options)
-    expect(el._onScroll).toEqual({
+    expect(el._onScroll[1]).toEqual({
       handler: binding.value,
       options,
       target: window,
@@ -41,7 +41,7 @@ describe('scroll.ts', () => {
     unbind(el, binding, vnode, vnode)
 
     expect(spyOnWindowRemoveListener).toHaveBeenCalledWith('scroll', binding.value, options)
-    expect(el._onScroll).toBeUndefined()
+    expect(el._onScroll[1]).toBeUndefined()
   })
 
   it('should work with a provided valid querySelector string', () => {
@@ -66,7 +66,7 @@ describe('scroll.ts', () => {
     inserted(el, binding, vnode, vnode)
 
     expect(spyOnFooAddListener).toHaveBeenCalledWith('scroll', binding.value, options)
-    expect(el._onScroll).toEqual({
+    expect(el._onScroll[1]).toEqual({
       handler: binding.value,
       options,
       target,
@@ -75,7 +75,7 @@ describe('scroll.ts', () => {
     unbind(el, binding, vnode, vnode)
 
     expect(spyOnFooRemoveListener).toHaveBeenCalledWith('scroll', binding.value, options)
-    expect(el._onScroll).toBeUndefined()
+    expect(el._onScroll[1]).toBeUndefined()
 
     document.body.removeChild(target)
   })
@@ -86,7 +86,7 @@ describe('scroll.ts', () => {
     inserted(el, binding, vnode, vnode)
 
     expect(el.addEventListener).toHaveBeenCalledWith('scroll', binding.value, options)
-    expect(el._onScroll).toEqual({
+    expect(el._onScroll[1]).toEqual({
       handler: binding.value,
       options,
       target: undefined,
@@ -95,7 +95,7 @@ describe('scroll.ts', () => {
     unbind(el, binding, vnode, vnode)
 
     expect(el.removeEventListener).toHaveBeenCalledWith('scroll', binding.value, options)
-    expect(el._onScroll).toBeUndefined()
+    expect(el._onScroll[1]).toBeUndefined()
   })
 
   it('should not remove listeners if no _onScroll property present', () => {
@@ -111,7 +111,7 @@ describe('scroll.ts', () => {
 
     inserted(el, binding, vnode, vnode)
 
-    expect(el._onScroll).toEqual({
+    expect(el._onScroll[1]).toEqual({
       handler,
       target: window,
       options: { passive: true },
@@ -121,7 +121,7 @@ describe('scroll.ts', () => {
 
     inserted(el, binding, vnode, vnode)
 
-    expect(el._onScroll).toEqual({
+    expect(el._onScroll[1]).toEqual({
       handler,
       target: window,
       options: { passive: false },

package/src/directives/scroll/index.ts

@@ -1,5 +1,5 @@
 import { VNodeDirective } from 'vue/types/vnode'
-import { DirectiveOptions } from 'vue'
+import { DirectiveOptions, VNode } from 'vue'
 
 interface ScrollVNodeDirective extends Omit<VNodeDirective, 'modifiers'> {
   value: EventListener | {
@@ -11,7 +11,7 @@ interface ScrollVNodeDirective extends Omit<VNodeDirective, 'modifiers'> {
   }
 }
 
-function inserted (el: HTMLElement, binding: ScrollVNodeDirective) {
+function inserted (el: HTMLElement, binding: ScrollVNodeDirective, vnode: VNode) {
   const { self = false } = binding.modifiers || {}
   const value = binding.value
   const options = (typeof value === 'object' && value.options) || { passive: true }
@@ -27,7 +27,8 @@ function inserted (el: HTMLElement, binding: ScrollVNodeDirective) {
 
   target.addEventListener('scroll', handler, options)
 
-  el._onScroll = {
+  el._onScroll = Object(el._onScroll)
+  el._onScroll![vnode.context!._uid] = {
     handler,
     options,
     // Don't reference self
@@ -35,13 +36,13 @@ function inserted (el: HTMLElement, binding: ScrollVNodeDirective) {
   }
 }
 
-function unbind (el: HTMLElement) {
-  if (!el._onScroll) return
+function unbind (el: HTMLElement, binding: ScrollVNodeDirective, vnode: VNode) {
+  if (!el._onScroll?.[vnode.context!._uid]) return
 
-  const { handler, options, target = el } = el._onScroll
+  const { handler, options, target = el } = el._onScroll[vnode.context!._uid]!
 
   target.removeEventListener('scroll', handler, options)
-  delete el._onScroll
+  delete el._onScroll[vnode.context!._uid]
 }
 
 export const Scroll = {

package/src/globals.d.ts

@@ -29,15 +29,14 @@ declare global {
   }
 
   interface HTMLElement {
-    _clickOutside?: {
-      lastMousedownWasOutside: boolean
+    _clickOutside?: Record<number, {
       onClick: EventListener
       onMousedown: EventListener
-    }
-    _onResize?: {
+    } | undefined> & { lastMousedownWasOutside: boolean }
+    _onResize?: Record<number, {
       callback: () => void
       options?: boolean | AddEventListenerOptions
-    }
+    } | undefined>
     _ripple?: {
       enabled?: boolean
       centered?: boolean
@@ -48,18 +47,18 @@ declare global {
       showTimer?: number
       showTimerCommit?: (() => void) | null
     }
-    _observe?: {
+    _observe?: Record<number, {
       init: boolean
       observer: IntersectionObserver
-    }
-    _mutate?: {
+    } | undefined>
+    _mutate?: Record<number, {
       observer: MutationObserver
-    }
-    _onScroll?: {
+    } | undefined>
+    _onScroll?: Record<number, {
       handler: EventListenerOrEventListenerObject
       options: boolean | AddEventListenerOptions
       target?: EventTarget
-    }
+    } | undefined>
     _touchHandlers?: {
       [_uid: number]: TouchStoredHandlers
     }
@@ -70,7 +69,6 @@ declare global {
       width: string
       height: string
     }
-    _initialDisplay?: [string, string]
   }
 
   interface WheelEvent {

package/src/locale/fr.ts

@@ -63,7 +63,7 @@ export default {
   },
   rating: {
     ariaLabel: {
-      icon: 'Rating {0} of {1}',
+      icon: 'Note de {0} sur {1}',
     },
   },
 }

package/src/mixins/detachable/index.ts

@@ -25,6 +25,14 @@ function validateAttachTarget (val: any) {
   return val.nodeType === Node.ELEMENT_NODE
 }
 
+function removeActivator (activator: VNode[]) {
+  activator.forEach(node => {
+    node.elm &&
+    node.elm.parentNode &&
+    node.elm.parentNode.removeChild(node.elm)
+  })
+}
+
 /* @vue/component */
 export default mixins<options &
   /* eslint-disable indent */
@@ -87,24 +95,33 @@ export default mixins<options &
   },
 
   beforeDestroy () {
-    // IE11 Fix
-    try {
-      if (
-        this.$refs.content &&
-        this.$refs.content.parentNode
-      ) {
-        this.$refs.content.parentNode.removeChild(this.$refs.content)
-      }
+    if (
+      this.$refs.content &&
+      this.$refs.content.parentNode
+    ) {
+      this.$refs.content.parentNode.removeChild(this.$refs.content)
+    }
+  },
 
-      if (this.activatorNode) {
-        const activator = Array.isArray(this.activatorNode) ? this.activatorNode : [this.activatorNode]
-        activator.forEach(node => {
-          node.elm &&
-            node.elm.parentNode &&
-            node.elm.parentNode.removeChild(node.elm)
+  destroyed () {
+    if (this.activatorNode) {
+      const activator = Array.isArray(this.activatorNode) ? this.activatorNode : [this.activatorNode]
+      if (this.$el.isConnected) {
+        // Component has been destroyed but the element still exists, we must be in a transition
+        // Wait for the transition to finish before cleaning up the detached activator
+        const observer = new MutationObserver(list => {
+          if (
+            list.some(record => Array.from(record.removedNodes).includes(this.$el))
+          ) {
+            observer.disconnect()
+            removeActivator(activator)
+          }
         })
+        observer.observe(this.$el.parentNode!, { subtree: false, childList: true })
+      } else {
+        removeActivator(activator)
       }
-    } catch (e) { console.log(e) } /* eslint-disable-line no-console */
+    }
   },
 
   methods: {

package/src/mixins/intersectable/index.ts

@@ -11,19 +11,28 @@ export default function intersectable (options: { onVisible: string[] }) {
   return Vue.extend({
     name: 'intersectable',
 
+    data: () => ({
+      isIntersecting: false,
+    }),
+
     mounted () {
       Intersect.inserted(this.$el as HTMLElement, {
         name: 'intersect',
         value: this.onObserve,
-      })
+      }, this.$vnode)
     },
 
     destroyed () {
-      Intersect.unbind(this.$el as HTMLElement)
+      Intersect.unbind(this.$el as HTMLElement, {
+        name: 'intersect',
+        value: this.onObserve,
+      }, this.$vnode)
     },
 
     methods: {
       onObserve (entries: IntersectionObserverEntry[], observer: IntersectionObserver, isIntersecting: boolean) {
+        this.isIntersecting = isIntersecting
+
         if (!isIntersecting) return
 
         for (let i = 0, length = options.onVisible.length; i < length; i++) {

package/src/mixins/overlayable/index.ts

@@ -156,20 +156,32 @@ export default Vue.extend<Vue & Toggleable & Stackable & options>().extend({
       if (!el || el.nodeType !== Node.ELEMENT_NODE) return false
 
       const style = window.getComputedStyle(el)
-      return ['auto', 'scroll'].includes(style.overflowY!) && el.scrollHeight > el.clientHeight
+      return ((['auto', 'scroll'].includes(style.overflowY!) || el.tagName === 'SELECT') && el.scrollHeight > el.clientHeight) ||
+      ((['auto', 'scroll'].includes(style.overflowX!)) && el.scrollWidth > el.clientWidth)
     },
-    shouldScroll (el: Element, delta: number): boolean {
+    shouldScroll (el: Element, e: WheelEvent): boolean {
       if (el.hasAttribute('data-app')) return false
 
-      const alreadyAtTop = el.scrollTop === 0
-      const alreadyAtBottom = el.scrollTop + el.clientHeight === el.scrollHeight
+      const dir = e.shiftKey || e.deltaX ? 'x' : 'y'
+      const delta = dir === 'y' ? e.deltaY : e.deltaX || e.deltaY
+
+      let alreadyAtStart: boolean
+      let alreadyAtEnd: boolean
+      if (dir === 'y') {
+        alreadyAtStart = el.scrollTop === 0
+        alreadyAtEnd = el.scrollTop + el.clientHeight === el.scrollHeight
+      } else {
+        alreadyAtStart = el.scrollLeft === 0
+        alreadyAtEnd = el.scrollLeft + el.clientWidth === el.scrollWidth
+      }
+
       const scrollingUp = delta < 0
       const scrollingDown = delta > 0
 
-      if (!alreadyAtTop && scrollingUp) return true
-      if (!alreadyAtBottom && scrollingDown) return true
-      if ((alreadyAtTop || alreadyAtBottom)) {
-        return this.shouldScroll(el.parentNode as Element, delta)
+      if (!alreadyAtStart && scrollingUp) return true
+      if (!alreadyAtEnd && scrollingDown) return true
+      if ((alreadyAtStart || alreadyAtEnd)) {
+        return this.shouldScroll(el.parentNode as Element, e)
       }
 
       return false
@@ -185,14 +197,13 @@ export default Vue.extend<Vue & Toggleable & Stackable & options>().extend({
     },
     checkPath (e: WheelEvent) {
       const path = composedPath(e)
-      const delta = e.deltaY
 
       if (e.type === 'keydown' && path[0] === document.body) {
         const dialog = this.$refs.dialog
         // getSelection returns null in firefox in some edge cases, can be ignored
         const selected = window.getSelection()!.anchorNode as Element
         if (dialog && this.hasScrollbar(dialog) && this.isInside(selected, dialog)) {
-          return !this.shouldScroll(dialog, delta)
+          return !this.shouldScroll(dialog, e)
         }
         return true
       }
@@ -204,7 +215,7 @@ export default Vue.extend<Vue & Toggleable & Stackable & options>().extend({
         if (el === document.documentElement) return true
         if (el === this.$refs.content) return true
 
-        if (this.hasScrollbar(el as Element)) return !this.shouldScroll(el as Element, delta)
+        if (this.hasScrollbar(el as Element)) return !this.shouldScroll(el as Element, e)
       }
 
       return true

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

@@ -1,12 +1,50 @@
 import Routable from '../'
-import { mount } from '@vue/test-utils'
+import { createLocalVue, mount, Wrapper } from '@vue/test-utils'
+import Router from 'vue-router'
+import Vue, { VNode } from 'vue'
 
 describe('routable.ts', () => {
+  let mountFunction: (options?: object) => Wrapper<Vue>
+  let router: Router
+  let localVue: typeof Vue
+
+  beforeEach(() => {
+    router = new Router()
+    localVue = createLocalVue()
+    localVue.use(Router)
+
+    mountFunction = (options = {}) => {
+      return mount({
+        mixins: [Routable],
+        props: {
+          activeClass: {
+            default: 'active',
+          },
+          exactActiveClass: {
+            default: 'exact-active',
+          },
+        },
+        render (h): VNode {
+          const { tag, data } = this.generateRouteLink()
+
+          data.attrs = {
+            ...data.attrs,
+          }
+          data.on = {
+            ...data.on,
+          }
+
+          return h(tag, data, this.$slots.default)
+        },
+      }, {
+        localVue,
+        router,
+        ...options,
+      })
+    }
+  })
   it('should generate exact route link with to="/" and undefined exact', async () => {
-    const wrapper = mount({
-      mixins: [Routable],
-      render: h => h('div'),
-    }, {
+    const wrapper = mountFunction({
       propsData: {
         to: '/',
       },
@@ -14,4 +52,43 @@ describe('routable.ts', () => {
 
     expect(wrapper.vm.generateRouteLink().data.props.exact).toBe(true)
   })
+
+  it('should reflect the link state to isActive', async () => {
+    const wrapper = mountFunction({
+      propsData: {
+        to: '/',
+      },
+    })
+    await wrapper.vm.$nextTick()
+    expect(wrapper.vm.isActive).toBe(true)
+
+    // Simulate route changing
+    wrapper.vm.$router.push('/foo')
+
+    await wrapper.vm.$nextTick()
+    await wrapper.vm.$nextTick()
+    expect(wrapper.vm.isActive).toBe(false)
+
+    wrapper.vm.$router.push('/')
+    await wrapper.vm.$nextTick()
+    await wrapper.vm.$nextTick()
+    expect(wrapper.vm.isActive).toBe(true)
+  })
+
+  it('should reflect the link state to isActive if not exact', async () => {
+    const wrapper = mountFunction({
+      propsData: {
+        to: '/foo',
+      },
+    })
+    await wrapper.vm.$nextTick()
+    expect(wrapper.vm.isActive).toBe(false)
+
+    // Simulate route changing
+    wrapper.vm.$router.push('/foo')
+
+    await wrapper.vm.$nextTick()
+    await wrapper.vm.$nextTick()
+    expect(wrapper.vm.isActive).toBe(true)
+  })
 })

package/src/mixins/routable/index.ts

@@ -75,6 +75,10 @@ export default Vue.extend({
     $route: 'onRouteChange',
   },
 
+  mounted () {
+    this.onRouteChange()
+  },
+
   methods: {
     click (e: MouseEvent): void {
       this.$emit('click', e)
@@ -140,16 +144,19 @@ export default Vue.extend({
     onRouteChange () {
       if (!this.to || !this.$refs.link || !this.$route) return
       const activeClass = `${this.activeClass} ${this.proxyClass || ''}`.trim()
+      const exactActiveClass = `${this.exactActiveClass} ${this.proxyClass || ''}`.trim() || activeClass
 
-      const path = `_vnode.data.class.${activeClass}`
+      const path = '_vnode.data.class.' + (this.exact ? exactActiveClass : activeClass)
 
       this.$nextTick(() => {
         /* istanbul ignore else */
-        if (getObjectValueByPath(this.$refs.link, path)) {
+        if (!getObjectValueByPath(this.$refs.link, path) === this.isActive) {
           this.toggle()
         }
       })
     },
-    toggle: () => { /* noop */ },
+    toggle () {
+      this.isActive = !this.isActive
+    },
   },
 })