@dimailn/vuetify 2.7.2-alpha25 → 2.7.2-alpha27

package/es5/components/VSelect/VSelect.js

@@ -45,6 +45,8 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
 
+function _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
+
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; }
 
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
@@ -65,9 +67,6 @@ var baseMixins = (0, _mixins.default)(_VTextField2.default, _comparable.default,
 
 var _default2 = baseMixins.extend({
   name: 'v-select',
-  directives: {
-    ClickOutside: _clickOutside.default
-  },
   props: {
     appendIcon: {
       type: String,
@@ -117,6 +116,7 @@ var _default2 = baseMixins.extend({
     returnObject: Boolean,
     smallChips: Boolean
   },
+  emits: ['update:modelValue', 'change', 'focus', 'blur', 'keydown', 'click', 'update:list-index'],
   data: function data() {
     return {
       cachedItems: this.cacheItems ? this.items : [],
@@ -130,7 +130,8 @@ var _default2 = baseMixins.extend({
       selectedIndex: -1,
       selectedItems: [],
       keyboardLookupPrefix: '',
-      keyboardLookupLastTime: 0
+      keyboardLookupLastTime: 0,
+      detectedScopeId: null
     };
   },
   computed: {
@@ -153,7 +154,9 @@ var _default2 = baseMixins.extend({
       return this.allItems;
     },
     computedOwns: function computedOwns() {
-      return "list-".concat(this.$.uid);
+      var _a;
+
+      return "list-".concat((_a = this.$) === null || _a === void 0 ? void 0 : _a.uid);
     },
     computedCounterValue: function computedCounterValue() {
       var _a;
@@ -192,9 +195,7 @@ var _default2 = baseMixins.extend({
       return this.selectedItems.length > 0;
     },
     listData: function listData() {
-      var scopeId = this.$vnode && this.$vnode.context.$options._scopeId;
-      var attrs = scopeId ? _defineProperty({}, scopeId, true) : {};
-      return _objectSpread(_objectSpread({}, attrs), {}, {
+      return {
         id: this.computedOwns,
         action: this.multiple,
         color: this.itemColor,
@@ -207,14 +208,24 @@ var _default2 = baseMixins.extend({
         noDataText: this.$vuetify.lang.t(this.noDataText),
         selectedItems: this.selectedItems,
         onSelect: this.selectItem
-      });
+      };
+    },
+    listAttrs: function listAttrs() {
+      var scopeIdAttrs = {}; // Используем detectedScopeId из mounted hook
+
+      if (this.detectedScopeId) {
+        scopeIdAttrs[this.detectedScopeId] = '';
+      } // scopeId успешно передается в VSelectList
+
+
+      return scopeIdAttrs;
     },
     staticList: function staticList() {
       if (this.$slots['no-data'] || this.$slots['prepend-item'] || this.$slots['append-item']) {
         (0, _console.consoleError)('assert: staticList should not be called if slots are used');
       }
 
-      return (0, _vue.h)(_VSelectList.default, this.listData, {
+      return (0, _vue.h)(_VSelectList.default, _objectSpread(_objectSpread({}, this.listData), this.listAttrs), {
         item: this.$slots.item
       });
     },
@@ -241,9 +252,28 @@ var _default2 = baseMixins.extend({
       }, normalisedProps);
     }
   },
+  mounted: function mounted() {
+    var _this2 = this;
+
+    this.$nextTick(function () {
+      if (_this2.$el && _this2.$el.attributes) {
+        var attrs = _this2.$el.attributes;
+
+        for (var i = 0; i < attrs.length; i++) {
+          var attr = attrs[i];
+
+          if (attr.name.startsWith('data-v-')) {
+            _this2.detectedScopeId = attr.name; // scopeId найден и сохранен для использования в dropdown
+
+            break;
+          }
+        }
+      }
+    });
+  },
   watch: {
     internalValue: function internalValue(val) {
-      var _this2 = this;
+      var _this3 = this;
 
       this.initialValue = val;
       this.setSelectedItems();
@@ -252,34 +282,34 @@ var _default2 = baseMixins.extend({
         this.$nextTick(function () {
           var _a;
 
-          (_a = _this2.$refs.menu) === null || _a === void 0 ? void 0 : _a.updateDimensions();
+          (_a = _this3.$refs.menu) === null || _a === void 0 ? void 0 : _a.updateDimensions();
         });
       }
 
       if (this.hideSelected) {
         this.$nextTick(function () {
-          _this2.onScroll();
+          _this3.onScroll();
         });
       }
     },
     isMenuActive: function isMenuActive(val) {
-      var _this3 = this;
+      var _this4 = this;
 
       window.setTimeout(function () {
-        return _this3.onMenuActiveChange(val);
+        return _this4.onMenuActiveChange(val);
       });
     },
     items: {
       immediate: true,
       handler: function handler(val) {
-        var _this4 = this;
+        var _this5 = this;
 
         if (this.cacheItems) {
           // Breaks vue-test-utils if
           // this isn't calculated
           // on the next tick
           this.$nextTick(function () {
-            _this4.cachedItems = _this4.filterDuplicates(_this4.cachedItems.concat(val));
+            _this5.cachedItems = _this5.filterDuplicates(_this5.cachedItems.concat(val));
           });
         }
 
@@ -304,12 +334,12 @@ var _default2 = baseMixins.extend({
       this.isMenuActive = true;
     },
     clearableCallback: function clearableCallback() {
-      var _this5 = this;
+      var _this6 = this;
 
       this.setValue(this.multiple ? [] : null);
       this.setMenuIndex(-1);
       this.$nextTick(function () {
-        return _this5.$refs.input && _this5.$refs.input.focus();
+        return _this6.$refs.input && _this6.$refs.input.focus();
       });
       if (this.openOnClear) this.isMenuActive = true;
     },
@@ -344,18 +374,18 @@ var _default2 = baseMixins.extend({
       return Array.from(uniqueValues.values());
     },
     findExistingIndex: function findExistingIndex(item) {
-      var _this6 = this;
+      var _this7 = this;
 
       var itemValue = this.getValue(item);
       return (this.internalValue || []).findIndex(function (i) {
-        return _this6.valueComparator(_this6.getValue(i), itemValue);
+        return _this7.valueComparator(_this7.getValue(i), itemValue);
       });
     },
     getContent: function getContent() {
       return this.$refs.menu && this.$refs.menu.$refs.content;
     },
     genChipSelection: function genChipSelection(item, index) {
-      var _this7 = this;
+      var _this8 = this;
 
       var isDisabled = this.isDisabled || this.getDisabled(item);
       var isInteractive = !isDisabled && this.isInteractive;
@@ -364,18 +394,20 @@ var _default2 = baseMixins.extend({
         tabindex: -1,
         close: this.deletableChips && isInteractive,
         disabled: isDisabled,
-        inputValue: index === this.selectedIndex,
+        modelValue: index === this.selectedIndex,
         small: this.smallChips,
         onClick: function onClick(e) {
           if (!isInteractive) return;
           e.stopPropagation();
-          _this7.selectedIndex = index;
+          _this8.selectedIndex = index;
         },
         'onClick:close': function onClickClose() {
-          return _this7.onChipInput(item);
+          return _this8.onChipInput(item);
         },
         key: JSON.stringify(this.getValue(item))
-      }, this.getText(item));
+      }, function () {
+        return _this8.getText(item);
+      });
     },
     genCommaSelection: function genCommaSelection(item, index, last) {
       var color = index === this.selectedIndex && this.computedColor;
@@ -408,11 +440,12 @@ var _default2 = baseMixins.extend({
 
       if (type === 'append') {
         // Don't allow the dropdown icon to be focused
-        var hasListeners = Object.keys(icon.children[0].props).some(function (key) {
+        var iconChild = icon.children[0];
+        var hasListeners = Object.keys(iconChild.props || {}).some(function (key) {
           return key.startsWith('on');
         });
-        icon.children[0].data = (0, _mergeData.default)(icon.children[0].props, {
-          tabindex: hasListeners && '-1',
+        iconChild.props = (0, _mergeData.default)(iconChild.props || {}, {
+          tabindex: hasListeners ? '-1' : undefined,
           'aria-hidden': 'true',
           'aria-label': undefined
         });
@@ -440,10 +473,26 @@ var _default2 = baseMixins.extend({
       return input;
     },
     genHiddenInput: function genHiddenInput() {
+      var _this9 = this;
+
+      var value = this.lazyValue;
+
+      if (this.multiple && Array.isArray(value)) {
+        value = value.map(function (item) {
+          if (_typeof(item) === 'object' && item !== null) {
+            return _this9.getValue(item);
+          }
+
+          return item;
+        }).join(',');
+      } else if (_typeof(value) === 'object' && value !== null) {
+        value = this.getValue(value);
+      }
+
       return (0, _vue.h)('input', {
-        value: this.lazyValue,
+        value: value,
         type: 'hidden',
-        name: this.attrs$.name
+        name: this.$attrs.name
       });
     },
     genInputSlot: function genInputSlot() {
@@ -466,22 +515,22 @@ var _default2 = baseMixins.extend({
       }
     },
     genListWithSlot: function genListWithSlot() {
-      var _this8 = this;
+      var _this10 = this;
 
       var slots = Object.fromEntries(['prepend-item', 'no-data', 'append-item'].filter(function (slotName) {
-        return _this8.$slots[slotName];
+        return _this10.$slots[slotName];
       }).map(function (slotName) {
-        return [slotName, _this8.$slots[slotName]];
+        return [slotName, _this10.$slots[slotName]];
       })); // Requires destructuring due to Vue
       // modifying the `on` property when passed
       // as a referenced object
 
-      return (0, _vue.h)(_VSelectList.default, _objectSpread({}, this.listData), _objectSpread(_objectSpread({}, slots), {}, {
+      return (0, _vue.h)(_VSelectList.default, _objectSpread(_objectSpread({}, this.listData), this.listAttrs), _objectSpread(_objectSpread({}, slots), {}, {
         item: this.$slots.item
       }));
     },
     genMenu: function genMenu() {
-      var _this9 = this;
+      var _this11 = this;
 
       var props = this.$_menuProps;
       props.activator = this.$refs['input-slot'];
@@ -500,12 +549,14 @@ var _default2 = baseMixins.extend({
         role: undefined
       }, props), {}, {
         onInput: function onInput(val) {
-          _this9.isMenuActive = val;
-          _this9.isFocused = val;
+          _this11.isMenuActive = val;
+          _this11.isFocused = val;
         },
         onScroll: this.onScroll,
         ref: 'menu'
-      }), [this.genList()]);
+      }), function () {
+        return [_this11.genList()];
+      });
     },
     genSelections: function genSelections() {
       var length = this.selectedItems.length;
@@ -529,7 +580,7 @@ var _default2 = baseMixins.extend({
       }, children);
     },
     genSlotSelection: function genSlotSelection(item, index) {
-      var _this10 = this;
+      var _this12 = this;
 
       return this.$slots.selection({
         class: 'v-chip--select',
@@ -538,7 +589,7 @@ var _default2 = baseMixins.extend({
         index: index,
         select: function select(e) {
           e.stopPropagation();
-          _this10.selectedIndex = index;
+          _this12.selectedIndex = index;
         },
         selected: index === this.selectedIndex,
         disabled: !this.isInteractive
@@ -594,7 +645,7 @@ var _default2 = baseMixins.extend({
       }
     },
     onKeyPress: function onKeyPress(e) {
-      var _this11 = this;
+      var _this13 = this;
 
       if (this.multiple || !this.isInteractive || this.disableLookup || e.key.length > 1 || e.ctrlKey || e.metaKey || e.altKey) return;
       var KEYBOARD_LOOKUP_THRESHOLD = 1000; // milliseconds
@@ -610,8 +661,8 @@ var _default2 = baseMixins.extend({
       var index = this.allItems.findIndex(function (item) {
         var _a;
 
-        var text = ((_a = _this11.getText(item)) !== null && _a !== void 0 ? _a : '').toString();
-        return text.toLowerCase().startsWith(_this11.keyboardLookupPrefix);
+        var text = ((_a = _this13.getText(item)) !== null && _a !== void 0 ? _a : '').toString();
+        return text.toLowerCase().startsWith(_this13.keyboardLookupPrefix);
       });
       var item = this.allItems[index];
 
@@ -619,15 +670,15 @@ var _default2 = baseMixins.extend({
         this.lastItem = Math.max(this.lastItem, index + 5);
         this.setValue(this.returnObject ? item : this.getValue(item));
         this.$nextTick(function () {
-          return _this11.$refs.menu.getTiles();
+          return _this13.$refs.menu.getTiles();
         });
         setTimeout(function () {
-          return _this11.setMenuIndex(index);
+          return _this13.setMenuIndex(index);
         });
       }
     },
     onKeyDown: function onKeyDown(e) {
-      var _this12 = this;
+      var _this14 = this;
 
       if (this.isReadonly && e.keyCode !== _helpers.keyCodes.tab) return;
       var keyCode = e.keyCode;
@@ -640,7 +691,7 @@ var _default2 = baseMixins.extend({
         this.$nextTick(function () {
           menu.changeListIndex(e);
 
-          _this12.$emit('update:list-index', menu.listIndex);
+          _this14.$emit('update:list-index', menu.listIndex);
         });
       } // If enter, space, open menu
 
@@ -676,7 +727,7 @@ var _default2 = baseMixins.extend({
       }
     },
     onMouseUp: function onMouseUp(e) {
-      var _this13 = this;
+      var _this15 = this;
 
       // eslint-disable-next-line sonarjs/no-collapsible-if
       if (this.hasMouseDown && e.which !== 3 && this.isInteractive) {
@@ -685,7 +736,7 @@ var _default2 = baseMixins.extend({
         // or inside, toggle menu
         if (this.isAppendInner(e.target)) {
           this.$nextTick(function () {
-            return _this13.isMenuActive = !_this13.isMenuActive;
+            return _this15.isMenuActive = !_this15.isMenuActive;
           });
         }
       }
@@ -693,11 +744,11 @@ var _default2 = baseMixins.extend({
       _VTextField2.default.methods.onMouseUp.call(this, e);
     },
     onScroll: function onScroll() {
-      var _this14 = this;
+      var _this16 = this;
 
       if (!this.isMenuActive) {
         requestAnimationFrame(function () {
-          var content = _this14.getContent();
+          var content = _this16.getContent();
 
           if (content) content.scrollTop = 0;
         });
@@ -731,7 +782,7 @@ var _default2 = baseMixins.extend({
       }
     },
     onUpDown: function onUpDown(e) {
-      var _this15 = this;
+      var _this17 = this;
 
       var menu = this.$refs.menu;
       if (!menu) return;
@@ -746,7 +797,7 @@ var _default2 = baseMixins.extend({
       menu.isBooted = true;
       window.requestAnimationFrame(function () {
         menu.getTiles();
-        if (!menu.hasClickableTiles) return _this15.activateMenu();
+        if (!menu.hasClickableTiles) return _this17.activateMenu();
 
         switch (keyCode) {
           case _helpers.keyCodes.up:
@@ -766,11 +817,11 @@ var _default2 = baseMixins.extend({
             break;
         }
 
-        _this15.selectItem(_this15.allItems[_this15.getMenuIndex()]);
+        _this17.selectItem(_this17.allItems[_this17.getMenuIndex()]);
       });
     },
     selectItem: function selectItem(item) {
-      var _this16 = this;
+      var _this18 = this;
 
       if (!this.multiple) {
         this.setValue(this.returnObject ? item : this.getValue(item));
@@ -780,7 +831,7 @@ var _default2 = baseMixins.extend({
         var i = this.findExistingIndex(item);
         i !== -1 ? internalValue.splice(i, 1) : internalValue.push(item);
         this.setValue(internalValue.map(function (i) {
-          return _this16.returnObject ? i : _this16.getValue(i);
+          return _this18.returnObject ? i : _this18.getValue(i);
         })); // There is no item to re-highlight
         // when selections are hidden
 
@@ -791,10 +842,10 @@ var _default2 = baseMixins.extend({
 
           if (~index) {
             this.$nextTick(function () {
-              return _this16.$refs.menu.getTiles();
+              return _this18.$refs.menu.getTiles();
             });
             setTimeout(function () {
-              return _this16.setMenuIndex(index);
+              return _this18.setMenuIndex(index);
             });
           }
         }
@@ -804,7 +855,7 @@ var _default2 = baseMixins.extend({
       this.$refs.menu && (this.$refs.menu.listIndex = index);
     },
     setSelectedItems: function setSelectedItems() {
-      var _this17 = this;
+      var _this19 = this;
 
       var selectedItems = [];
       var values = !this.multiple || !Array.isArray(this.internalValue) ? [this.internalValue] : this.internalValue;
@@ -816,12 +867,12 @@ var _default2 = baseMixins.extend({
         var _loop = function _loop() {
           var value = _step.value;
 
-          var index = _this17.allItems.findIndex(function (v) {
-            return _this17.valueComparator(_this17.getValue(v), _this17.getValue(value));
+          var index = _this19.allItems.findIndex(function (v) {
+            return _this19.valueComparator(_this19.getValue(v), _this19.getValue(value));
           });
 
           if (index > -1) {
-            selectedItems.push(_this17.allItems[index]);
+            selectedItems.push(_this19.allItems[index]);
           }
         };
 
@@ -839,7 +890,7 @@ var _default2 = baseMixins.extend({
     setValue: function setValue(value) {
       if (!this.valueComparator(value, this.internalValue)) {
         this.internalValue = value;
-        this.$emit('update:modelValue', value);
+        this.$emit('update:modelValue', value); // Note: change event is already emitted by VInput's internalValue setter
       }
     },
     isAppendInner: function isAppendInner(target) {