@dimailn/vuetify 2.7.2-alpha4 → 2.7.2-alpha40

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

@@ -6,9 +6,12 @@ import VRating from '../VRating'
 
 // Utilities
 import {
-  mount
+  mount,
+  VueWrapper,
+  MountingOptions,
 } from '@vue/test-utils'
 import { mergeDeep } from '../../../util/helpers'
+import { nextTick } from 'vue'
 
 
 const $vuetify = {
@@ -25,13 +28,12 @@ const $vuetify = {
 }
 
 describe('VRating.ts', () => {
-  // type Instance = ExtractVue<typeof VRating>
-  let mountFunction//: (options?: object) => Wrapper<Instance>
+  type Instance = InstanceType<typeof VRating>
+  let mountFunction: (options?: MountingOptions<Instance>) => VueWrapper<Instance>
 
   beforeEach(() => {
-    mountFunction = (options: MountOptions<Instance>) => {
+    mountFunction = (options?: MountingOptions<Instance>) => {
       return mount(VRating, mergeDeep({
-        // https://github.com/vuejs/vue-test-utils/issues/1130
         global: {
           config: {
             globalProperties: {
@@ -55,13 +57,13 @@ describe('VRating.ts', () => {
 
     wrapper.setProps({ readonly: false })
 
-    await wrapper.vm.$nextTick()
+    await nextTick()
 
     expect(wrapper.vm.directives[0][1].isDirActive).toBe(true)
 
     wrapper.setProps({ ripple: false })
 
-    await wrapper.vm.$nextTick()
+    await nextTick()
 
     expect(wrapper.vm.directives[0][1].isDirActive).toBe(false)
   })
@@ -72,7 +74,7 @@ describe('VRating.ts', () => {
     expect(wrapper.vm.internalValue).toBe(0)
 
     wrapper.setProps({ modelValue: 1 })
-    await wrapper.vm.$nextTick()
+    await nextTick()
 
     expect(wrapper.vm.internalValue).toBe(1)
 
@@ -82,7 +84,7 @@ describe('VRating.ts', () => {
 
     icon.trigger('click')
 
-    await wrapper.vm.$nextTick()
+    await nextTick()
 
     expect(wrapper.emitted()).toHaveProperty('update:modelValue')
     expect(wrapper.emitted()['update:modelValue'][0][0]).toBe(2)
@@ -94,7 +96,7 @@ describe('VRating.ts', () => {
     expect(wrapper.vm.internalValue).toBe(0)
 
     wrapper.setProps({ modelValue: 1, clearable: false })
-    await wrapper.vm.$nextTick()
+    await nextTick()
 
     expect(wrapper.vm.internalValue).toBe(1)
 
@@ -102,17 +104,17 @@ describe('VRating.ts', () => {
 
     icon.trigger('click')
 
-    await wrapper.vm.$nextTick()
+    await nextTick()
 
     expect(wrapper.vm.internalValue).toBe(1)
 
     wrapper.setProps({ clearable: true })
 
-    await wrapper.vm.$nextTick()
+    await nextTick()
 
     icon.trigger('click')
 
-    await wrapper.vm.$nextTick()
+    await nextTick()
 
     expect(wrapper.vm.internalValue).toBe(0)
   })
@@ -128,17 +130,17 @@ describe('VRating.ts', () => {
 
     icon.trigger('click')
 
-    await wrapper.vm.$nextTick()
+    await nextTick()
 
     expect(wrapper.emitted()).not.toHaveProperty('update:modelValue')
 
     wrapper.setProps({ readonly: false })
 
-    await wrapper.vm.$nextTick()
+    await nextTick()
 
     icon.trigger('click')
 
-    await wrapper.vm.$nextTick()
+    await nextTick()
 
     expect(wrapper.emitted()).toHaveProperty('update:modelValue')
     expect(wrapper.emitted()['update:modelValue'][0][0]).toBe(1)
@@ -180,7 +182,7 @@ describe('VRating.ts', () => {
 
     wrapper.setProps({ halfIncrements: true })
 
-    await wrapper.vm.$nextTick()
+    await nextTick()
 
     expect(wrapper.vm.genHoverIndex({
       pageX: 0,
@@ -212,25 +214,21 @@ describe('VRating.ts', () => {
     })
 
     const event = new MouseEvent('hover')
-    expect(wrapper.vm.genHoverIndex(event, 1)).toBe(1.5)
-
-    wrapper.setProps({ halfIncrements: true })
-
-    await wrapper.vm.$nextTick()
+    expect(wrapper.vm.genHoverIndex(event, 1)).toBe(2)
 
     expect(wrapper.vm.genHoverIndex({
       pageX: 0,
       target: {
         getBoundingClientRect: () => ({ width: 10, left: 0 }),
       },
-    }, 1)).toBe(2)
+    }, 1)).toBe(1.5)
 
     expect(wrapper.vm.genHoverIndex({
       pageX: 6,
       target: {
         getBoundingClientRect: () => ({ width: 10, left: 0 }),
       },
-    }, 1)).toBe(1.5)
+    }, 1)).toBe(2)
   })
 
   it('should render a scoped slot', () => {
@@ -240,10 +238,7 @@ describe('VRating.ts', () => {
       render: () => h(VRating, {}, {item: itemSlot})
     }
 
-    const wrapper = mount(component, {
-      // https://github.com/vuejs/vue-test-utils/issues/1130
-      sync: false,
-    })
+    const wrapper = mount(component)
 
     expect(wrapper.html()).toMatchSnapshot()
   })
@@ -269,7 +264,7 @@ describe('VRating.ts', () => {
   it('should reset hoverIndex on mouse leave', () => {
     jest.useFakeTimers()
     const wrapper = mountFunction({
-      propsData: { hover: true },
+      props: { hover: true },
     })
 
     const icon = wrapper.find('.v-icon')

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

@@ -4,12 +4,17 @@ import VResponsive from '../VResponsive'
 // Utilities
 import {
   mount,
-  Wrapper,
+  VueWrapper,
+  MountingOptions,
+  enableAutoUnmount,
 } from '@vue/test-utils'
+import { h } from 'vue'
 
 describe('VResponsive.ts', () => {
   type Instance = InstanceType<typeof VResponsive>
-  let mountFunction: (options?: object) => Wrapper<Instance>
+  let mountFunction: (options?: MountingOptions<Instance>) => VueWrapper<Instance>
+
+  enableAutoUnmount(afterEach)
 
   beforeEach(() => {
     mountFunction = (options = {}) => {
@@ -21,7 +26,7 @@ describe('VResponsive.ts', () => {
 
   it('should force aspect ratio', () => {
     const wrapper = mountFunction({
-      propsData: { aspectRatio: 16 / 9 },
+      props: { aspectRatio: 16 / 9 },
     })
 
     expect(wrapper.html()).toMatchSnapshot()
@@ -30,7 +35,7 @@ describe('VResponsive.ts', () => {
   it('should render content', () => {
     const wrapper = mountFunction({
       slots: {
-        default: { render: h => h('div', ['content']) },
+        default: () => h('div', ['content']),
       },
     })
 
@@ -39,7 +44,7 @@ describe('VResponsive.ts', () => {
 
   it('should set height', () => {
     const wrapper = mountFunction({
-      propsData: { height: 100, maxHeight: 200 },
+      props: { height: 100, maxHeight: 200 },
     })
 
     expect(wrapper.html()).toMatchSnapshot()

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

@@ -2,8 +2,8 @@
 
 exports[`VResponsive.ts should force aspect ratio 1`] = `
 <div class="v-responsive">
-  <div class="v-responsive__sizer"
-       style="padding-bottom: 56.25%;"
+  <div style="padding-bottom: 56.25%;"
+       class="v-responsive__sizer"
   >
   </div>
   <div class="v-responsive__content">

package/src/components/VSelect/VSelect.ts

@@ -22,7 +22,7 @@ import ClickOutside from '../../directives/click-outside'
 // Utilities
 import mergeData from '../../util/mergeData'
 import { getPropertyFromItem, getObjectValueByPath, keyCodes, normalizeAttrs } from '../../util/helpers'
-import { consoleError } from '../../util/console'
+import { consoleError, breaking } from '../../util/console'
 
 // Types
 import mixins from '../../util/mixins'
@@ -63,9 +63,8 @@ interface options extends InstanceType<typeof baseMixins> {
 export default baseMixins.extend({
   name: 'v-select',
 
-  directives: {
-    ClickOutside,
-  },
+  $_emitChangeEvent: true,
+  $_modelEvent: 'update:modelValue',
 
   props: {
     appendIcon: {
@@ -76,6 +75,7 @@ export default baseMixins.extend({
       type: null as unknown as PropType<string | boolean | Element | VNode>,
       default: false,
     },
+    auto: Boolean,
     cacheItems: Boolean,
     chips: Boolean,
     clearable: Boolean,
@@ -107,12 +107,15 @@ export default baseMixins.extend({
       type: [String, Array, Object],
       default: () => defaultMenuProps,
     },
+    minWidth: [String, Number],
     multiple: Boolean,
     openOnClear: Boolean,
     returnObject: Boolean,
     smallChips: Boolean,
   },
 
+  emits: ['update:modelValue', 'change', 'focus', 'blur', 'keydown', 'click', 'update:list-index', 'click:clear'],
+
   data () {
     return {
       cachedItems: this.cacheItems ? this.items : [],
@@ -129,6 +132,7 @@ export default baseMixins.extend({
       selectedItems: [] as any[],
       keyboardLookupPrefix: '',
       keyboardLookupLastTime: 0,
+      detectedScopeId: null as string | null,
     }
   },
 
@@ -152,7 +156,7 @@ export default baseMixins.extend({
       return this.allItems
     },
     computedOwns (): string {
-      return `list-${this.$.uid}`
+      return `list-${this.$?.uid}`
     },
     computedCounterValue (): number {
       const value = this.multiple
@@ -173,8 +177,8 @@ export default baseMixins.extend({
             handler: () => this.isFocused && this.blur(),
             closeConditional: this.closeConditional,
             include: () => this.getOpenDependentElements(),
-          }
-        ]
+          },
+        ],
       ]
     },
     dynamicHeight () {
@@ -190,13 +194,7 @@ export default baseMixins.extend({
       return this.selectedItems.length > 0
     },
     listData (): object {
-      const scopeId = this.$vnode && (this.$vnode.context!.$options as { [key: string]: any })._scopeId
-      const attrs = scopeId ? {
-        [scopeId]: true,
-      } : {}
-
       return {
-        ...attrs,
         id: this.computedOwns,
         action: this.multiple,
         color: this.itemColor,
@@ -211,12 +209,27 @@ export default baseMixins.extend({
         onSelect: this.selectItem,
       }
     },
+    listAttrs (): object {
+      const scopeIdAttrs: Record<string, any> = {}
+
+      // Используем detectedScopeId из mounted hook
+      if (this.detectedScopeId) {
+        scopeIdAttrs[this.detectedScopeId] = ''
+      }
+
+      // scopeId успешно передается в VSelectList
+
+      return scopeIdAttrs
+    },
     staticList (): VNode {
       if (this.$slots['no-data'] || this.$slots['prepend-item'] || this.$slots['append-item']) {
         consoleError('assert: staticList should not be called if slots are used')
       }
 
-      return h(VSelectList, this.listData,  {
+      return h(VSelectList, {
+        ...this.listData,
+        ...this.listAttrs,
+      }, {
         item: this.$slots.item,
       })
     },
@@ -243,26 +256,31 @@ export default baseMixins.extend({
         eager: this.eager,
         modelValue: this.menuCanShow && this.isMenuActive,
         nudgeBottom: normalisedProps.offsetY ? 1 : 0, // convert to int
+        auto: this.auto,
+        minWidth: this.minWidth,
         ...normalisedProps,
       }
     },
   },
 
   watch: {
-    internalValue (val) {
-      this.initialValue = val
-      this.setSelectedItems()
+    internalValue: {
+      handler (val) {
+        this.initialValue = val
+        this.setSelectedItems()
 
-      if (this.multiple) {
-        this.$nextTick(() => {
-          this.$refs.menu?.updateDimensions()
-        })
-      }
-      if (this.hideSelected) {
-        this.$nextTick(() => {
-          this.onScroll()
-        })
-      }
+        if (this.multiple) {
+          this.$nextTick(() => {
+            this.$refs.menu?.updateDimensions()
+          })
+        }
+        if (this.hideSelected) {
+          this.$nextTick(() => {
+            this.onScroll()
+          })
+        }
+      },
+      deep: true,
     },
     isMenuActive (val) {
       window.setTimeout(() => this.onMenuActiveChange(val))
@@ -284,6 +302,34 @@ export default baseMixins.extend({
     },
   },
 
+  created () {
+    const breakingProps = [
+      ['value', 'modelValue'],
+      ['onInput', 'onUpdate:modelValue'],
+    ]
+
+    /* istanbul ignore next */
+    breakingProps.forEach(([original, replacement]) => {
+      if (this.$attrs.hasOwnProperty(original)) breaking(original, replacement, this)
+    })
+  },
+
+  mounted () {
+    this.$nextTick(() => {
+      if (this.$el && this.$el.attributes) {
+        const attrs = this.$el.attributes
+        for (let i = 0; i < attrs.length; i++) {
+          const attr = attrs[i]
+          if (attr.name.startsWith('data-v-')) {
+            this.detectedScopeId = attr.name
+            // scopeId найден и сохранен для использования в dropdown
+            break
+          }
+        }
+      }
+    })
+  },
+
   methods: {
     /** @public */
     blur (e?: Event) {
@@ -308,12 +354,13 @@ export default baseMixins.extend({
       this.$nextTick(() => this.$refs.input && this.$refs.input.focus())
 
       if (this.openOnClear) this.isMenuActive = true
+      this.$emit('click:clear')
     },
     closeConditional (e: Event) {
       if (!this.isMenuActive) return true
 
       return (
-        !this._isDestroyed &&
+        !this.$.isUnmounted &&
 
         // Click originates from outside the menu content
         // Multiple selects don't close when an item is clicked
@@ -368,7 +415,7 @@ export default baseMixins.extend({
         tabindex: -1,
         close: this.deletableChips && isInteractive,
         disabled: isDisabled,
-        inputValue: index === this.selectedIndex,
+        modelValue: index === this.selectedIndex,
         small: this.smallChips,
         onClick: (e: MouseEvent) => {
           if (!isInteractive) return
@@ -379,7 +426,7 @@ export default baseMixins.extend({
         },
         'onClick:close': () => this.onChipInput(item),
         key: JSON.stringify(this.getValue(item)),
-      }, this.getText(item))
+      }, () => this.getText(item))
     },
     genCommaSelection (item: object, index: number, last: boolean) {
       const color = index === this.selectedIndex && this.computedColor
@@ -412,7 +459,7 @@ export default baseMixins.extend({
       return [
         this.genFieldset(),
         withDirectives(h('div', {
-          class: 'v-select__slot'
+          class: 'v-select__slot',
         }, [
           this.genLabel(),
           this.prefix ? this.genAffix('prefix') : null,
@@ -435,11 +482,12 @@ export default baseMixins.extend({
 
       if (type === 'append') {
         // Don't allow the dropdown icon to be focused
-        const hasListeners = Object.keys(icon.children![0].props).some(key => key.startsWith('on'))
-        icon.children![0].data = mergeData(icon.children![0].props!, {
-          tabindex: hasListeners && '-1',
+        const iconChild = icon.children![0]
+        const hasListeners = Object.keys(iconChild.props || {}).some(key => key.startsWith('on'))
+        iconChild.props = mergeData(iconChild.props || {}, {
+          tabindex: hasListeners ? '-1' : undefined,
           'aria-hidden': 'true',
-          'aria-label': undefined
+          'aria-label': undefined,
         })
       }
 
@@ -466,10 +514,23 @@ export default baseMixins.extend({
       return input
     },
     genHiddenInput (): VNode {
+      let value = this.lazyValue
+
+      if (this.multiple && Array.isArray(value)) {
+        value = value.map(item => {
+          if (typeof item === 'object' && item !== null) {
+            return this.getValue(item)
+          }
+          return item
+        }).join(',')
+      } else if (typeof value === 'object' && value !== null) {
+        value = this.getValue(value)
+      }
+
       return h('input', {
-        value: this.lazyValue,
+        value,
         type: 'hidden',
-        name: this.attrs$.name
+        name: this.$attrs.name,
       })
     },
     genInputSlot (): VNode {
@@ -480,7 +541,7 @@ export default baseMixins.extend({
         'aria-haspopup': 'listbox',
         'aria-expanded': String(this.isMenuActive),
         'aria-owns': this.computedOwns,
-        ...render.props
+        ...render.props,
       }
 
       return render
@@ -494,18 +555,20 @@ export default baseMixins.extend({
       }
     },
     genListWithSlot (): VNode {
-      const slots = ['prepend-item', 'no-data', 'append-item']
+      const slots = Object.fromEntries(['prepend-item', 'no-data', 'append-item']
         .filter(slotName => this.$slots[slotName])
-        .map(slotName => h('template', {
-          slot: slotName,
-        }, this.$slots[slotName]))
+        .map(slotName => [
+          slotName,
+          this.$slots[slotName],
+        ]
+        ))
       // Requires destructuring due to Vue
       // modifying the `on` property when passed
       // as a referenced object
-
       return h(VSelectList, {
         ...this.listData,
-      }, {...slots,item: this.$slots.item})
+        ...this.listAttrs,
+      }, { ...slots, item: this.$slots.item })
     },
     genMenu (): VNode {
       const props = this.$_menuProps as any
@@ -528,13 +591,13 @@ export default baseMixins.extend({
       return h(VMenu, {
         role: undefined,
         ...props,
-        onInput: (val: boolean) => {
+        'onUpdate:modelValue': (val: boolean) => {
           this.isMenuActive = val
           this.isFocused = val
         },
         onScroll: this.onScroll,
         ref: 'menu',
-      }, [this.genList()])
+      }, () => [this.genList()])
     },
     genSelections (): VNode {
       let length = this.selectedItems.length
@@ -568,7 +631,7 @@ export default baseMixins.extend({
         parent: this,
         item,
         index,
-        select: (e: Event) => {
+        onSelect: (e: Event) => {
           e.stopPropagation()
           this.selectedIndex = index
         },
@@ -875,7 +938,6 @@ export default baseMixins.extend({
     setValue (value: any) {
       if (!this.valueComparator(value, this.internalValue)) {
         this.internalValue = value
-        this.$emit('update:modelValue', value)
       }
     },
     isAppendInner (target: any) {