@dimailn/vuetify 2.7.2-alpha26 → 2.7.2-alpha28

package/src/components/VSelect/VSelect.ts

@@ -63,10 +63,6 @@ interface options extends InstanceType<typeof baseMixins> {
 export default baseMixins.extend({
   name: 'v-select',
 
-  directives: {
-    ClickOutside,
-  },
-
   props: {
     appendIcon: {
       type: String,
@@ -113,6 +109,8 @@ export default baseMixins.extend({
     smallChips: Boolean,
   },
 
+  emits: ['update:modelValue', 'change', 'focus', 'blur', 'keydown', 'click', 'update:list-index'],
+
   data () {
     return {
       cachedItems: this.cacheItems ? this.items : [],
@@ -129,6 +127,7 @@ export default baseMixins.extend({
       selectedItems: [] as any[],
       keyboardLookupPrefix: '',
       keyboardLookupLastTime: 0,
+      detectedScopeId: null as string | null,
     }
   },
 
@@ -152,7 +151,7 @@ export default baseMixins.extend({
       return this.allItems
     },
     computedOwns (): string {
-      return `list-${this.$.uid}`
+      return `list-${this.$?.uid}`
     },
     computedCounterValue (): number {
       const value = this.multiple
@@ -190,13 +189,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 +204,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,
       })
     },
@@ -248,6 +256,22 @@ export default baseMixins.extend({
     },
   },
 
+  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
+          }
+        }
+      }
+    })
+  },
+
   watch: {
     internalValue (val) {
       this.initialValue = val
@@ -368,7 +392,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
@@ -435,9 +459,10 @@ 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
         })
@@ -466,10 +491,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: value,
         type: 'hidden',
-        name: this.attrs$.name
+        name: this.$attrs.name
       })
     },
     genInputSlot (): VNode {
@@ -506,7 +544,8 @@ export default baseMixins.extend({
       // 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
@@ -877,6 +916,7 @@ export default baseMixins.extend({
       if (!this.valueComparator(value, this.internalValue)) {
         this.internalValue = value
         this.$emit('update:modelValue', value)
+        // Note: change event is already emitted by VInput's internalValue setter
       }
     },
     isAppendInner (target: any) {

package/src/components/VSelect/VSelectList.ts

@@ -32,11 +32,6 @@ type ListTile = { item: any, disabled?: null | boolean, value?: boolean, index:
 export default mixins(Colorable, Themeable).extend({
   name: 'v-select-list',
 
-  // https://github.com/vuejs/vue/issues/6872
-  directives: {
-    ripple,
-  },
-
   props: {
     action: Boolean,
     dense: Boolean,
@@ -92,12 +87,12 @@ export default mixins(Colorable, Themeable).extend({
           color: this.color,
           modelValue: inputValue,
           ripple: false,
-          onInput: () => this.$emit('select', item)
+          onInput: () => this.$emit('select', item),
         }),
       ])
     },
     genDivider (props: { [key: string]: any }) {
-      return h(VDivider, { props })
+      return h(VDivider, props)
     },
     genFilteredText (text: string) {
       text = text || ''
@@ -109,7 +104,7 @@ export default mixins(Colorable, Themeable).extend({
       return [start, this.genHighlight(middle), end]
     },
     genHeader (props: { [key: string]: any }): VNode {
-      return h(VSubheader, { props }, props.header)
+      return h(VSubheader, props, props.header)
     },
     genHighlight (text: string) {
       return h('span', { class: 'v-list-item__mask' }, text)
@@ -157,7 +152,14 @@ export default mixins(Colorable, Themeable).extend({
         activeClass: this.tileActiveClass,
         disabled,
         ripple: true,
-        inputValue: value,
+        modelValue: value,
+        // Передаем scopeId атрибуты от родительского компонента
+        ...Object.keys(this.$attrs).reduce((acc, key) => {
+          if (key.startsWith('data-v-')) {
+            acc[key] = this.$attrs[key]
+          }
+          return acc
+        }, {} as Record<string, any>),
       }
 
       if (!this.$slots.item) {
@@ -170,16 +172,17 @@ export default mixins(Colorable, Themeable).extend({
       }
 
       const parent = this
+      const { onClick, onMousedown, ...attrsWithoutEvents } = tile
       const scopedSlot = this.$slots.item({
         parent,
         item,
-        attrs: {
-          ...tile.attrs,
-          ...tile.props,
-          ...tile.on
-        },
-        on: tile.on,
-      })
+        active: value,
+        attrs: tile,
+        on: {
+          onMousedown,
+          onClick
+        }
+      });
 
       return this.needsTile(scopedSlot)
         ? h(VListItem, tile, scopedSlot)
@@ -234,6 +237,7 @@ export default mixins(Colorable, Themeable).extend({
     this.$slots['append-item'] && children.push(this.$slots['append-item']())
 
     return h(VList, {
+      ...this.$attrs,
       class: ['v-select-list', this.themeClasses],
       role: 'listbox',
       tabindex: -1,