@dimailn/vuetify 2.7.2-alpha26 → 2.7.2-alpha28

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

@@ -1,29 +1,20 @@
-// Libraries
-import Vue from 'vue'
-
 // Components
 import VLabel from '../VLabel'
 
 // Utilities
 import {
-  createLocalVue,
   mount,
-  Wrapper,
+  VueWrapper,
 } from '@vue/test-utils'
 
 describe('VLabel', () => {
-  let mountFunction: (options?: object) => Wrapper<Vue>
-  let localVue: typeof Vue
+  type Instance = InstanceType<typeof VLabel>
+  let mountFunction: (options?: any) => VueWrapper<Instance>
 
   beforeEach(() => {
-    localVue = createLocalVue()
-
-    mountFunction = (ctx = {}) => {
+    mountFunction = (options = {}) => {
       return mount(VLabel, {
-        localVue,
-        context: {
-          ...ctx,
-        },
+        ...options,
       })
     }
   })
@@ -48,4 +39,239 @@ describe('VLabel', () => {
 
     expect(wrapper.element.style.position).toBe('absolute')
   })
+
+  it('should render default slot content', () => {
+    const wrapper = mountFunction({
+      slots: {
+        default: 'Custom Label Text',
+      },
+    })
+
+    expect(wrapper.text()).toBe('Custom Label Text')
+  })
+
+  it('should render complex slot content with HTML', () => {
+    const wrapper = mountFunction({
+      slots: {
+        default: '<span class="custom-class">Label with <strong>bold</strong> text</span>',
+      },
+    })
+
+    expect(wrapper.find('.custom-class').exists()).toBe(true)
+    expect(wrapper.find('strong').exists()).toBe(true)
+    expect(wrapper.find('strong').text()).toBe('bold')
+  })
+
+  it('should render slot content with components', () => {
+    const TestComponent = {
+      template: '<span class="test-component">Test Component</span>',
+    }
+
+    const wrapper = mountFunction({
+      slots: {
+        default: TestComponent,
+      },
+    })
+
+    expect(wrapper.find('.test-component').exists()).toBe(true)
+    expect(wrapper.find('.test-component').text()).toBe('Test Component')
+  })
+
+  it('should render slot content with multiple elements', () => {
+    const wrapper = mountFunction({
+      slots: {
+        default: [
+          '<span class="first">First</span>',
+          '<span class="second">Second</span>',
+        ],
+      },
+    })
+
+    expect(wrapper.find('.first').exists()).toBe(true)
+    expect(wrapper.find('.second').exists()).toBe(true)
+    expect(wrapper.find('.first').text()).toBe('First')
+    expect(wrapper.find('.second').text()).toBe('Second')
+  })
+
+  it('should render empty content when no slot provided', () => {
+    const wrapper = mountFunction()
+
+    expect(wrapper.text()).toBe('')
+  })
+
+  it('should apply proper classes when slot content is present', () => {
+    const wrapper = mountFunction({
+      slots: {
+        default: 'Test Label',
+      },
+      props: {
+        value: true,
+        disabled: true,
+      },
+    })
+
+    expect(wrapper.classes('v-label--active')).toBe(true)
+    expect(wrapper.classes('v-label--is-disabled')).toBe(true)
+  })
+
+  it('should render slot content with proper for attribute', () => {
+    const wrapper = mountFunction({
+      props: {
+        for: 'test-input',
+      },
+      slots: {
+        default: 'Label for input',
+      },
+    })
+
+    expect(wrapper.attributes('for')).toBe('test-input')
+    expect(wrapper.attributes('aria-hidden')).toBe('false')
+  })
+
+  it('should set aria-hidden when no for attribute provided', () => {
+    const wrapper = mountFunction({
+      slots: {
+        default: 'Label without for',
+      },
+    })
+
+    expect(wrapper.attributes('aria-hidden')).toBe('true')
+  })
+
+  it('should render slot content with proper positioning', () => {
+    const wrapper = mountFunction({
+      props: {
+        left: 10,
+        right: 20,
+      },
+      slots: {
+        default: 'Positioned label',
+      },
+    })
+
+    expect(wrapper.element.style.left).toBe('10px')
+    expect(wrapper.element.style.right).toBe('20px')
+  })
+
+  it('should render slot content with theme classes', () => {
+    const wrapper = mountFunction({
+      props: {
+        dark: true,
+      },
+      slots: {
+        default: 'Dark theme label',
+      },
+    })
+
+    expect(wrapper.classes('theme--dark')).toBe(true)
+  })
+
+  it('should handle focused state with color', () => {
+    const wrapper = mountFunction({
+      props: {
+        focused: true,
+        color: 'error',
+      },
+      slots: {
+        default: 'Focused error label',
+      },
+    })
+
+    expect(wrapper.classes('error--text')).toBe(true)
+  })
+
+  it('should handle disabled state', () => {
+    const wrapper = mountFunction({
+      props: {
+        disabled: true,
+      },
+      slots: {
+        default: 'Disabled label',
+      },
+    })
+
+    expect(wrapper.classes('v-label--is-disabled')).toBe(true)
+  })
+
+  it('should handle active state', () => {
+    const wrapper = mountFunction({
+      props: {
+        value: true,
+      },
+      slots: {
+        default: 'Active label',
+      },
+    })
+
+    expect(wrapper.classes('v-label--active')).toBe(true)
+  })
+
+  it('should handle custom positioning with string values', () => {
+    const wrapper = mountFunction({
+      props: {
+        left: '20%',
+        right: '30px',
+      },
+      slots: {
+        default: 'Positioned label',
+      },
+    })
+
+    expect(wrapper.element.style.left).toBe('20%')
+    expect(wrapper.element.style.right).toBe('30px')
+  })
+
+  it('should handle light theme', () => {
+    const wrapper = mountFunction({
+      props: {
+        light: true,
+      },
+      slots: {
+        default: 'Light theme label',
+      },
+    })
+
+    expect(wrapper.classes('theme--light')).toBe(true)
+  })
+
+  it('should handle multiple theme classes', () => {
+    const wrapper = mountFunction({
+      props: {
+        dark: true,
+        light: false,
+      },
+      slots: {
+        default: 'Theme label',
+      },
+    })
+
+    expect(wrapper.classes('theme--dark')).toBe(true)
+    expect(wrapper.classes('theme--light')).toBe(false)
+  })
+
+  it('should render slot content with proper element tag', () => {
+    const wrapper = mountFunction({
+      slots: {
+        default: 'Label content',
+      },
+    })
+
+    expect(wrapper.element.tagName.toLowerCase()).toBe('label')
+  })
+
+  it('should handle slot content with event listeners', () => {
+    const onClick = jest.fn()
+
+    const wrapper = mountFunction({
+      attrs: {
+        onClick,
+      },
+      slots: {
+        default: 'Clickable label',
+      },
+    })
+
+    wrapper.trigger('click')
+    expect(onClick).toHaveBeenCalled()
+  })
 })

package/src/components/VLazy/VLazy.ts

@@ -1,4 +1,4 @@
-import {Transition, h} from 'vue'
+import { Transition, h, withDirectives, defineComponent } from 'vue'
 // Mixins
 import Measurable from '../../mixins/measurable'
 import Toggleable from '../../mixins/toggleable'
@@ -20,7 +20,8 @@ export default mixins(
 ).extend({
   name: 'VLazy',
 
-  directives: { intersect },
+  emits: ['update:modelValue'],
+
 
   props: {
     options: {
@@ -73,18 +74,15 @@ export default mixins(
   },
 
   render (): VNode {
-    return h(this.tag, {
+    return withDirectives(h(this.tag, {
       class: 'v-lazy',
-      attrs: this.$attrs,
-      directives: [{
-        name: 'intersect',
-        value: {
-          handler: this.onObserve,
-          options: this.options,
-        },
-      }],
-      on: this.$listeners,
+      ...this.$attrs,
       style: this.styles,
-    }, [this.genContent()])
+    }, [this.genContent()]), [
+      [intersect, {
+        handler: this.onObserve,
+        options: this.options,
+      }]
+    ])
   },
 })

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

@@ -6,12 +6,15 @@ import {
   mount,
   MountOptions,
   Wrapper,
+  enableAutoUnmount,
 } from '@vue/test-utils'
 
 describe('VLazy.ts', () => {
   type Instance = InstanceType<typeof VLazy>
   let mountFunction: (options?: MountOptions<Instance>) => Wrapper<Instance>
 
+  enableAutoUnmount(afterEach)
+
   beforeEach(() => {
     mountFunction = (options = {}) => {
       return mount(VLazy, {
@@ -29,16 +32,14 @@ describe('VLazy.ts', () => {
 
     expect(wrapper.html()).toMatchSnapshot()
 
-    wrapper.setProps({ value: true })
-
-    await wrapper.vm.$nextTick()
+    await wrapper.setProps({ modelValue: true })
 
     expect(wrapper.html()).toMatchSnapshot()
   })
 
   it('should set a minimum height', () => {
     const wrapper = mountFunction({
-      propsData: {
+      props: {
         minHeight: 200,
       },
     })

package/src/components/VLazy/__tests__/__snapshots__/VLazy.spec.ts.snap

@@ -2,12 +2,13 @@
 
 exports[`VLazy.ts should conditionally render content 1`] = `
 <div class="v-lazy">
+  false
 </div>
 `;
 
 exports[`VLazy.ts should conditionally render content 2`] = `
 <div class="v-lazy">
-  <div>
+  <div class="fade-transition-enter-from fade-transition-enter-active">
     foobar
   </div>
 </div>

package/src/components/VList/VListGroup.ts

@@ -1,4 +1,4 @@
-import {h, withDirectives, vShow} from 'vue'
+import { h, withDirectives, vShow, VNode } from 'vue'
 // Styles
 import './VListGroup.sass'
 
@@ -26,7 +26,6 @@ import mixins, { ExtractVue } from '../../util/mixins'
 import { getSlot } from '../../util/helpers'
 
 // Types
-import { VNode } from 'vue'
 import { Route } from 'vue-router'
 
 const baseMixins = mixins(
@@ -50,7 +49,6 @@ interface options extends ExtractVue<typeof baseMixins> {
 export default baseMixins.extend({
   name: 'v-list-group',
 
-  directives: { ripple },
 
   props: {
     activeClass: {
@@ -144,7 +142,8 @@ export default baseMixins.extend({
           'v-list-group__header': true,
           [this.activeClass]: this.isActive,
         },
-        inputValue: this.isActive,
+        link: true,
+        modelValue: this.isActive,
         ...this.listeners$,
         onClick: this.click
       }, () => [
@@ -153,19 +152,19 @@ export default baseMixins.extend({
         this.genAppendIcon(),
       ]),
       [
-        [Ripple, this.ripple]
+        [Ripple, this.ripple],
       ])
     },
     genItems (): VNode[] {
       const directives = [[
         vShow,
-        this.isActive
+        this.isActive,
       ]]
 
       return this.showLazyContent(() => [
         withDirectives(h('div', {
           class: 'v-list-group__items',
-        }, getSlot(this)), directives)
+        }, getSlot(this)), directives),
       ])
     },
     genPrependIcon (): VNode | null {
@@ -208,7 +207,7 @@ export default baseMixins.extend({
 
   render (): VNode {
     return h('div', this.setTextColor(this.isActive && this.color, {
-      class: ['v-list-group', this.classes]
+      class: ['v-list-group', this.classes],
     }), [
       this.genHeader(),
       h(VExpandTransition, {}, () => this.genItems()),

package/src/components/VList/VListItem.ts

@@ -1,4 +1,4 @@
-import {h, withDirectives} from 'vue'
+import { h, withDirectives, VNode, PropType, PropValidator } from 'vue'
 // Styles
 import './VListItem.sass'
 
@@ -14,21 +14,19 @@ import Ripple from '../../directives/ripple'
 
 // Utilities
 import { getSlot, keyCodes } from './../../util/helpers'
-import mergeData from './../../util/mergeData'
+import mergeData, { mergeClasses } from './../../util/mergeData'
 import { ExtractVue } from './../../util/mixins'
 import { removed } from '../../util/console'
 
 // Types
 import mixins from '../../util/mixins'
-import { VNode } from 'vue'
-import { PropType, PropValidator } from 'vue/types/options'
 
 const baseMixins = mixins(
   Colorable,
   Routable,
   Themeable,
   GroupableFactory('listItemGroup'),
-  ToggleableFactory('inputValue')
+  ToggleableFactory('modelValue')
 )
 
 interface options extends ExtractVue<typeof baseMixins> {
@@ -43,10 +41,6 @@ interface options extends ExtractVue<typeof baseMixins> {
 export default baseMixins.extend({
   name: 'v-list-item',
 
-  directives: {
-    Ripple,
-  },
-
   inject: {
     isInGroup: {
       default: false,
@@ -66,10 +60,11 @@ export default baseMixins.extend({
 
   props: {
     activeClass: {
-      type: String
+      type: String,
     } as any as PropValidator<string>,
     dense: Boolean,
     inactive: Boolean,
+    onClick: Function as PropType<(e: MouseEvent) => void>,
     link: Boolean,
     selectable: {
       type: Boolean,
@@ -80,16 +75,23 @@ export default baseMixins.extend({
     },
     threeLine: Boolean,
     twoLine: Boolean,
-    value: null as any as PropType<any>,
+    modelValue: null as any as PropType<any>,
   },
 
+  emits: [
+    'click',
+    'keydown',
+    'change',
+    'update:modelValue',
+  ],
+
   data: () => ({
     proxyClass: 'v-list-item--active',
   }),
 
   computed: {
-    $activeClass() {
-      if(this.activeClass) return this.activeClass
+    $activeClass () {
+      if (this.activeClass) return this.activeClass
       if (!this.listItemGroup) return ''
 
       return this.listItemGroup.activeClass
@@ -131,10 +133,11 @@ export default baseMixins.extend({
       this.to || this.toggle()
     },
     genAttrs () {
+      const { class: _, ...otherAttrs } = this.$attrs
       const attrs: Record<string, any> = {
+        ...otherAttrs,
         'aria-disabled': this.disabled ? true : undefined,
         tabindex: this.isClickable && !this.disabled ? 0 : -1,
-        ...this.$attrs,
       }
 
       if (this.$attrs.hasOwnProperty('role')) {
@@ -154,19 +157,21 @@ export default baseMixins.extend({
       return attrs
     },
     toggle () {
-      if (this.to && this.inputValue === undefined) {
+      if (this.to && this.modelValue === undefined) {
         this.isActive = !this.isActive
       }
       this.$emit('change')
+      this.$emitLegacy('change')
     },
   },
 
   render (): VNode {
     let { tag, data, directives } = this.generateRouteLink()
+    const attrs = this.genAttrs()
 
     data = mergeData(
       data,
-      this.genAttrs()
+      attrs
     )
 
     data = {
@@ -179,6 +184,8 @@ export default baseMixins.extend({
           this.$emit('keydown', e)
         }
       },
+      // Ensure our attrs take precedence over routable
+      ...attrs,
     }
 
     if (this.inactive) tag = 'div'
@@ -187,13 +194,26 @@ export default baseMixins.extend({
     //   delete data.nativeOn
     // }
 
-    const children = getSlot(this, 'default', {
+    const slotProps = {
       active: this.isActive,
       toggle: this.toggle,
-    })
+    }
+
+    const children = [
+      getSlot(this, 'prepend', slotProps),
+      getSlot(this, 'default', slotProps),
+      getSlot(this, 'append', slotProps),
+    ].filter(Boolean)
 
     const nodeData = this.isActive ? this.setTextColor(this.color, data) : data
 
+    const attrsClasses = this.$attrs.class
+    if (attrsClasses) {
+      nodeData.class = [this.classes, attrsClasses]
+    } else {
+      nodeData.class = this.classes
+    }
+
     const node = typeof tag === 'string'
       ? h(tag, nodeData, children)
       : h(tag, nodeData, () => children)

package/src/components/VList/VListItemAction.ts

@@ -1,22 +1,23 @@
 // Types
-import { defineComponent, VNode, h } from 'vue'
+import { defineComponent, VNode, h, Comment } from 'vue'
 
 /* @vue/component */
 export default defineComponent({
   name: 'v-list-item-action',
 
-  functional: true,
-
   render (): VNode {
-    const data = this.$attrs
-    data.class = data.class ? `v-list-item__action ${data.class}` : 'v-list-item__action'
-    const children = this.$slots.default()
+    const { class: attrClass, ...otherAttrs } = this.$attrs
+    let className = attrClass ? `v-list-item__action ${attrClass}` : 'v-list-item__action'
+    const children = this.$slots.default?.() || []
 
-    const filteredChild = children.filter(VNode => {
-      return VNode.isComment === false && VNode.text !== ' '
+    const filteredChild = children.filter((vnode: any) => {
+      return vnode?.type !== Comment && vnode?.children !== ' '
     })
-    if (filteredChild.length > 1) data.class += ' v-list-item__action--stack'
+    if (filteredChild.length > 1) className += ' v-list-item__action--stack'
 
-    return h('div', data, children)
+    return h('div', {
+      ...otherAttrs,
+      class: className
+    }, children)
   },
 })

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

@@ -2,14 +2,11 @@
 import VList from '../VList'
 
 // Utilities
-import {
-  mount,
-  Wrapper,
-} from '@vue/test-utils'
+import { mount, VueWrapper } from '@vue/test-utils'
 
 describe('VList.ts', () => {
-  type Instance = InstanceType<typeof VList>
-  let mountFunction: (options?: object) => Wrapper<Instance>
+  type Instance = InstanceType<typeof VList>;
+  let mountFunction: (options?: any) => VueWrapper<Instance>
 
   beforeEach(() => {
     mountFunction = (options = {}) => {
@@ -27,7 +24,7 @@ describe('VList.ts', () => {
 
   it('should render a dense component and match snapshot', () => {
     const wrapper = mountFunction({
-      propsData: {
+      props: {
         dense: true,
       },
     })
@@ -37,7 +34,7 @@ describe('VList.ts', () => {
 
   it('should render a subheader component and match snapshot', () => {
     const wrapper = mountFunction({
-      propsData: {
+      props: {
         subheader: true,
       },
     })
@@ -47,7 +44,7 @@ describe('VList.ts', () => {
 
   it('should render a threeLine component and match snapshot', () => {
     const wrapper = mountFunction({
-      propsData: {
+      props: {
         threeLine: true,
       },
     })
@@ -57,7 +54,7 @@ describe('VList.ts', () => {
 
   it('should render a twoLine component and match snapshot', () => {
     const wrapper = mountFunction({
-      propsData: {
+      props: {
         twoLine: true,
       },
     })
@@ -67,13 +64,17 @@ describe('VList.ts', () => {
 
   it('should have an inferred role from injections', () => {
     const wrapper = mountFunction({
-      provide: { isInMenu: true },
+      global: {
+        provide: { isInMenu: true },
+      },
     })
 
     expect(wrapper.element.getAttribute('role')).toBeNull()
 
     const wrapper2 = mountFunction({
-      provide: { isInNav: true },
+      global: {
+        provide: { isInNav: true },
+      },
     })
 
     expect(wrapper2.element.getAttribute('role')).toBeNull()