vuetify 2.5.9 → 2.5.13

package/src/components/VTooltip/VTooltip.ts

@@ -26,10 +26,6 @@ export default mixins(Colorable, Delayable, Dependent, Menuable, Toggleable).ext
       default: 0,
     },
     disabled: Boolean,
-    fixed: {
-      type: Boolean,
-      default: true,
-    },
     openDelay: {
       type: [Number, String],
       default: 0,
@@ -97,8 +93,9 @@ export default mixins(Colorable, Delayable, Dependent, Menuable, Toggleable).ext
 
       if (this.nudgeTop) top -= parseInt(this.nudgeTop)
       if (this.nudgeBottom) top += parseInt(this.nudgeBottom)
+      if (this.attach === false) top += this.pageYOffset
 
-      return `${this.calcYOverflow(top + this.pageYOffset)}px`
+      return `${this.calcYOverflow(top)}px`
     },
     classes (): object {
       return {

package/src/components/VTreeview/VTreeview.ts

@@ -228,7 +228,7 @@ export default mixins(
 
         this.nodes[key] = node
 
-        if (children.length) {
+        if (children.length && this.selectionType !== 'independent') {
           const { isSelected, isIndeterminate } = this.calculateState(key, this.nodes)
 
           node.isSelected = isSelected

package/src/components/transitions/createTransition.ts

@@ -87,11 +87,7 @@ export function createSimpleTransition (
       }
       if (context.props.hideOnLeave) {
         data.on!.leave = mergeTransitions(data.on!.leave, (el: HTMLElement) => {
-          (el as any)._initialDisplay = el.style.display
-          el.style.display = 'none'
-        })
-        data.on!.afterLeave = mergeTransitions(data.on!.afterLeave, (el?: HTMLElement) => {
-          if (el) el.style.display = (el as any)._initialDisplay || ''
+          el.style.setProperty('display', 'none', 'important')
         })
       }
 

package/src/directives/click-outside/__tests__/click-outside-shadow-dom.spec.ts

@@ -13,7 +13,8 @@ function bootstrap (args?: object) {
       handler: jest.fn(),
       ...args,
     },
-  }
+  } as any
+  const vnode = { context: { _uid: 1 } } as any
 
   let shadowClickHandler
   let outsideClickHandler
@@ -37,9 +38,11 @@ function bootstrap (args?: object) {
   jest.spyOn(window.document, 'removeEventListener')
   jest.spyOn(shadowRoot, 'removeEventListener')
 
-  ClickOutside.inserted(shadowEl as HTMLElement, binding as any)
+  ClickOutside.inserted(shadowEl as HTMLElement, binding, vnode)
 
   return {
+    binding,
+    vnode,
     callback: binding.value.handler,
     shadowEl: shadowEl as HTMLElement,
     outsideEl: outsideEl as HTMLElement,
@@ -53,18 +56,18 @@ function bootstrap (args?: object) {
 
 describe('click-outside.js within the Shadow DOM', () => {
   it('should register and unregister handler outside of the shadow DOM', () => {
-    const { outsideClickHandler, shadowEl } = bootstrap()
+    const { outsideClickHandler, shadowEl, binding, vnode } = bootstrap()
     expect(window.document.addEventListener).toHaveBeenCalledWith('click', outsideClickHandler, true)
 
-    ClickOutside.unbind(shadowEl)
+    ClickOutside.unbind(shadowEl, binding, vnode)
     expect(window.document.removeEventListener).toHaveBeenCalledWith('click', outsideClickHandler, true)
   })
 
   it('should register and unregister handler within the shadow DOM', () => {
-    const { shadowClickHandler, shadowRoot, shadowEl } = bootstrap()
+    const { shadowClickHandler, shadowRoot, shadowEl, binding, vnode } = bootstrap()
     expect(shadowRoot.addEventListener).toHaveBeenCalledWith('click', shadowClickHandler, true)
 
-    ClickOutside.unbind(shadowEl)
+    ClickOutside.unbind(shadowEl, binding, vnode)
     expect(shadowRoot.removeEventListener).toHaveBeenCalledWith('click', shadowClickHandler, true)
   })
 

package/src/directives/click-outside/__tests__/click-outside.spec.ts

@@ -10,7 +10,8 @@ function bootstrap (args?: object) {
       handler: jest.fn(),
       ...args,
     },
-  }
+  } as any
+  const vnode = { context: { _uid: 1 } } as any
 
   let clickHandler
   let mousedownHandler
@@ -20,9 +21,11 @@ function bootstrap (args?: object) {
   })
   jest.spyOn(window.document, 'removeEventListener')
 
-  ClickOutside.inserted(el as HTMLElement, binding as any)
+  ClickOutside.inserted(el as HTMLElement, binding, vnode)
 
   return {
+    binding,
+    vnode,
     callback: binding.value.handler,
     el: el as HTMLElement,
     clickHandler,
@@ -32,10 +35,10 @@ function bootstrap (args?: object) {
 
 describe('click-outside', () => {
   it('should register and unregister handler', () => {
-    const { clickHandler, el } = bootstrap()
+    const { clickHandler, el, binding, vnode } = bootstrap()
     expect(window.document.addEventListener).toHaveBeenCalledWith('click', clickHandler, true)
 
-    ClickOutside.unbind(el)
+    ClickOutside.unbind(el, binding, vnode)
     expect(window.document.removeEventListener).toHaveBeenCalledWith('click', clickHandler, true)
   })
 

package/src/directives/click-outside/index.ts

@@ -1,5 +1,6 @@
 import { attachedRoot } from '../../util/dom'
 import { VNodeDirective } from 'vue/types/vnode'
+import { VNode } from 'vue'
 
 interface ClickOutsideBindingArgs {
   handler: (e: Event) => void
@@ -52,7 +53,7 @@ function checkIsActive (e: PointerEvent, binding: ClickOutsideDirective): boolea
   return isActive(e)
 }
 
-function directive (e: PointerEvent, el: HTMLElement, binding: ClickOutsideDirective) {
+function directive (e: PointerEvent, el: HTMLElement, binding: ClickOutsideDirective, vnode: VNode) {
   const handler = typeof binding.value === 'function' ? binding.value : binding.value!.handler
 
   el._clickOutside!.lastMousedownWasOutside && checkEvent(e, el, binding) && setTimeout(() => {
@@ -65,7 +66,7 @@ function handleShadow (el: HTMLElement, callback: Function): void {
 
   callback(document)
 
-  if (root instanceof ShadowRoot) {
+  if (typeof ShadowRoot !== 'undefined' && root instanceof ShadowRoot) {
     callback(root)
   }
 }
@@ -76,8 +77,8 @@ export const ClickOutside = {
   // sure that the root element is
   // available, iOS does not support
   // clicks on body
-  inserted (el: HTMLElement, binding: ClickOutsideDirective) {
-    const onClick = (e: Event) => directive(e as PointerEvent, el, binding)
+  inserted (el: HTMLElement, binding: ClickOutsideDirective, vnode: VNode) {
+    const onClick = (e: Event) => directive(e as PointerEvent, el, binding, vnode)
     const onMousedown = (e: Event) => {
       el._clickOutside!.lastMousedownWasOutside = checkEvent(e as PointerEvent, el, binding)
     }
@@ -87,23 +88,31 @@ export const ClickOutside = {
       app.addEventListener('mousedown', onMousedown, true)
     })
 
-    el._clickOutside = {
-      lastMousedownWasOutside: true,
+    if (!el._clickOutside) {
+      el._clickOutside = {
+        lastMousedownWasOutside: true,
+      }
+    }
+
+    el._clickOutside[vnode.context!._uid] = {
       onClick,
       onMousedown,
     }
   },
 
-  unbind (el: HTMLElement) {
+  unbind (el: HTMLElement, binding: ClickOutsideDirective, vnode: VNode) {
     if (!el._clickOutside) return
 
     handleShadow(el, (app: HTMLElement) => {
       if (!app || !el._clickOutside) return
-      app.removeEventListener('click', el._clickOutside.onClick, true)
-      app.removeEventListener('mousedown', el._clickOutside.onMousedown, true)
+
+      const { onClick, onMousedown } = el._clickOutside[vnode.context!._uid]
+
+      app.removeEventListener('click', onClick, true)
+      app.removeEventListener('mousedown', onMousedown, true)
     })
 
-    delete el._clickOutside
+    delete el._clickOutside[vnode.context!._uid]
   },
 }
 

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

@@ -10,16 +10,19 @@ describe('intersect', () => {
     Intersect.inserted(el, {
       value: callback,
       modifiers: { quiet: true },
-    } as any)
+    } as any, { context: { _uid: 1 } } as any)
 
     expect((el as any)._observe).toBeTruthy()
     expect(callback).not.toHaveBeenCalled()
 
     document.body.removeChild(el)
 
-    Intersect.unbind(el)
+    Intersect.unbind(el, {
+      value: callback,
+      modifiers: { quiet: true },
+    } as any, { context: { _uid: 1 } } as any)
 
-    expect((el as any)._observe).toBeFalsy()
+    expect((el as any)._observe[1]).toBeFalsy()
   })
 
   it('should invoke callback once and unbind', () => {
@@ -32,19 +35,19 @@ describe('intersect', () => {
     Intersect.inserted(el, {
       value: callback,
       modifiers: { once: true },
-    } as any)
+    } as any, { context: { _uid: 1 } } as any)
 
-    expect(callback).toHaveBeenCalledTimes(1)
-    expect((el as any)._observe).toBeTruthy()
+    expect(callback).toHaveBeenCalledTimes(0)
+    expect((el as any)._observe[1]).toBeTruthy()
 
-    ;(el as any)._observe.observer.callback([{ isIntersecting: false }])
+    ;(el as any)._observe[1].observer.callback([{ isIntersecting: false }])
 
     expect(callback).toHaveBeenCalledTimes(1)
-    expect((el as any)._observe).toBeTruthy()
+    expect((el as any)._observe[1]).toBeTruthy()
 
-    ;(el as any)._observe.observer.callback([{ isIntersecting: true }])
+    ;(el as any)._observe[1].observer.callback([{ isIntersecting: true }])
 
     expect(callback).toHaveBeenCalledTimes(2)
-    expect((el as any)._observe).toBeFalsy()
+    expect((el as any)._observe[1]).toBeFalsy()
   })
 })

package/src/directives/intersect/index.ts

@@ -1,4 +1,5 @@
 import { VNodeDirective } from 'vue/types/vnode'
+import { VNode } from 'vue'
 
 type ObserveHandler = (
   entries: IntersectionObserverEntry[],
@@ -14,7 +15,7 @@ interface ObserveVNodeDirective extends Omit<VNodeDirective, 'modifiers'> {
   }
 }
 
-function inserted (el: HTMLElement, binding: ObserveVNodeDirective) {
+function inserted (el: HTMLElement, binding: ObserveVNodeDirective, vnode: VNode) {
   if (typeof window === 'undefined' || !('IntersectionObserver' in window)) return
 
   const modifiers = binding.modifiers || {}
@@ -26,9 +27,9 @@ function inserted (el: HTMLElement, binding: ObserveVNodeDirective) {
     entries: IntersectionObserverEntry[] = [],
     observer: IntersectionObserver
   ) => {
-    /* istanbul ignore if */
-    if (!el._observe) return // Just in case, should never fire
+    if (!el._observe?.[vnode.context!._uid]) return // Just in case, should never fire
 
+    const _observe = el._observe[vnode.context!._uid]
     const isIntersecting = entries.some(entry => entry.isIntersecting)
 
     // If is not quiet or has already been
@@ -36,31 +37,31 @@ function inserted (el: HTMLElement, binding: ObserveVNodeDirective) {
     if (
       handler && (
         !modifiers.quiet ||
-        el._observe.init
+        _observe.init
       ) && (
         !modifiers.once ||
         isIntersecting ||
-        !el._observe.init
+        _observe.init
       )
     ) {
       handler(entries, observer, isIntersecting)
     }
 
-    if (isIntersecting && modifiers.once) unbind(el)
-    else el._observe.init = true
+    if (isIntersecting && modifiers.once) unbind(el, binding, vnode)
+    else _observe.init = true
   }, options)
 
-  el._observe = { init: false, observer }
+  el._observe = Object(el._observe)
+  el._observe![vnode.context!._uid] = { init: false, observer }
 
   observer.observe(el)
 }
 
-function unbind (el: HTMLElement) {
-  /* istanbul ignore if */
+function unbind (el: HTMLElement, binding: ObserveVNodeDirective, vnode: VNode) {
   if (!el._observe) return
 
-  el._observe.observer.unobserve(el)
-  delete el._observe
+  el._observe[vnode.context!._uid].observer.unobserve(el)
+  delete el._observe[vnode.context!._uid]
 }
 
 export const Intersect = {

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

@@ -29,16 +29,18 @@ describe('mutate.ts', () => {
 
     Mutate.inserted(el, {
       value: callback,
-    } as any)
+    } as any, { context: { _uid: 1 } } as any)
 
     expect(el._mutate).toBeTruthy()
     expect(callback).not.toHaveBeenCalled()
 
     document.body.removeChild(el)
 
-    Mutate.unbind(el)
+    Mutate.unbind(el, {
+      value: callback,
+    } as any, { context: { _uid: 1 } } as any)
 
-    expect(el._mutate).toBeFalsy()
+    expect(el._mutate[1]).toBeFalsy()
   })
 
   it('should fire event on mutation', () => {
@@ -48,15 +50,17 @@ describe('mutate.ts', () => {
 
     Mutate.inserted(el, {
       value: callback,
-    } as any)
+    } as any, { context: { _uid: 1 } } as any)
 
-    el._mutate.observer.trigger([{}])
+    el._mutate[1].observer.trigger([{}])
 
     expect(callback).toHaveBeenCalledTimes(1)
 
     document.body.removeChild(el)
 
-    Mutate.unbind(el)
+    Mutate.unbind(el, {
+      value: callback,
+    } as any, { context: { _uid: 1 } } as any)
   })
 
   it('should fire event once', () => {
@@ -69,12 +73,12 @@ describe('mutate.ts', () => {
       modifiers: {
         once: true,
       },
-    } as any)
+    } as any, { context: { _uid: 1 } } as any)
 
-    el._mutate.observer.trigger([{}])
+    el._mutate[1].observer.trigger([{}])
 
     expect(callback).toHaveBeenCalledTimes(1)
-    expect(el._mutate).toBeFalsy()
+    expect(el._mutate[1]).toBeFalsy()
 
     document.body.removeChild(el)
   })
@@ -92,16 +96,24 @@ describe('mutate.ts', () => {
         },
         handler: callback,
       },
-    } as any)
+    } as any, { context: { _uid: 1 } } as any)
 
-    el._mutate.observer.trigger([{}])
+    el._mutate[1].observer.trigger([{}])
 
     expect(callback).toHaveBeenCalledTimes(1)
-    expect(el._mutate.observer._observe).toHaveBeenLastCalledWith({ attributes: false, subtree: true })
+    expect(el._mutate[1].observer._observe).toHaveBeenLastCalledWith({ attributes: false, subtree: true })
 
     document.body.removeChild(el)
 
-    Mutate.unbind(el)
+    Mutate.unbind(el, {
+      value: {
+        options: {
+          attributes: false,
+          subtree: true,
+        },
+        handler: callback,
+      },
+    } as any, { context: { _uid: 1 } } as any)
   })
 
   it('should work with observer modifiers', () => {
@@ -116,15 +128,22 @@ describe('mutate.ts', () => {
         child: true,
         sub: true,
       },
-    } as any)
+    } as any, { context: { _uid: 1 } } as any)
 
-    el._mutate.observer.trigger([{}])
+    el._mutate[1].observer.trigger([{}])
 
     expect(callback).toHaveBeenCalledTimes(1)
-    expect(el._mutate.observer._observe).toHaveBeenLastCalledWith({ attributes: true, childList: true, subtree: true })
+    expect(el._mutate[1].observer._observe).toHaveBeenLastCalledWith({ attributes: true, childList: true, subtree: true })
 
     document.body.removeChild(el)
 
-    Mutate.unbind(el)
+    Mutate.unbind(el, {
+      value: callback,
+      modifiers: {
+        attr: true,
+        child: true,
+        sub: true,
+      },
+    } as any, { context: { _uid: 1 } } as any)
   })
 })

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,20 @@ 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) {
+function unbind (el: HTMLElement, binding: MutateVNodeDirective, vnode: VNode) {
   /* istanbul ignore if */
   if (!el._mutate) 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) {
+function unbind (el: HTMLElement, binding: ResizeVNodeDirective, vnode: VNode) {
   if (!el._onResize) return
 
-  const { callback, options } = el._onResize
+  const { callback, options } = el._onResize[vnode.context!._uid]
+
   window.removeEventListener('resize', callback, options)
-  delete el._onResize
+
+  delete el._onResize[vnode.context!._uid]
 }
 
 export const Resize = {

package/src/directives/ripple/index.ts

@@ -8,9 +8,7 @@ import { keyCodes } from '../../util/helpers'
 // Types
 import { VNode, VNodeDirective } from 'vue'
 
-const rippleStop = Symbol('rippleStop')
-
-type VuetifyRippleEvent = (MouseEvent | TouchEvent | KeyboardEvent) & { [rippleStop]?: boolean }
+type VuetifyRippleEvent = (MouseEvent | TouchEvent | KeyboardEvent) & { rippleStop?: boolean }
 
 const DELAY_RIPPLE = 80
 
@@ -162,10 +160,10 @@ function rippleShow (e: VuetifyRippleEvent) {
   const value: RippleOptions = {}
   const element = e.currentTarget as HTMLElement
 
-  if (!element || !element._ripple || element._ripple.touched || e[rippleStop]) return
+  if (!element || !element._ripple || element._ripple.touched || e.rippleStop) return
 
   // Don't allow the event to trigger ripples on any other elements
-  e[rippleStop] = true
+  e.rippleStop = true
 
   if (isTouchEvent(e)) {
     element._ripple.touched = true

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 },