@dimailn/vuetify 2.7.2-alpha4 → 2.7.2-alpha41

package/es5/components/VSelect/VSelect.js

@@ -39,12 +39,22 @@ var _vue = require("vue");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-function _createForOfIteratorHelper(o, allowArrayLike) { var it; if (typeof Symbol === "undefined" || o[Symbol.iterator] == null) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = o[Symbol.iterator](); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
+function _createForOfIteratorHelper(o, allowArrayLike) { var it; if (typeof Symbol === "undefined" || o[Symbol.iterator] == null) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e2) { throw _e2; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = o[Symbol.iterator](); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e3) { didErr = true; err = _e3; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
+
+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 _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
+
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
 
 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 _iterableToArrayLimit(arr, i) { if (typeof Symbol === "undefined" || !(Symbol.iterator in Object(arr))) return; var _arr = []; var _n = true; var _d = false; var _e = undefined; try { for (var _i = arr[Symbol.iterator](), _s; !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
+
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+
 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 +75,8 @@ var baseMixins = (0, _mixins.default)(_VTextField2.default, _comparable.default,
 
 var _default2 = baseMixins.extend({
   name: 'v-select',
-  directives: {
-    ClickOutside: _clickOutside.default
-  },
+  $_emitChangeEvent: true,
+  $_modelEvent: 'update:modelValue',
   props: {
     appendIcon: {
       type: String,
@@ -77,6 +86,7 @@ var _default2 = baseMixins.extend({
       type: null,
       default: false
     },
+    auto: Boolean,
     cacheItems: Boolean,
     chips: Boolean,
     clearable: Boolean,
@@ -112,11 +122,13 @@ var _default2 = baseMixins.extend({
         return 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: function data() {
     return {
       cachedItems: this.cacheItems ? this.items : [],
@@ -130,7 +142,8 @@ var _default2 = baseMixins.extend({
       selectedIndex: -1,
       selectedItems: [],
       keyboardLookupPrefix: '',
-      keyboardLookupLastTime: 0
+      keyboardLookupLastTime: 0,
+      detectedScopeId: null
     };
   },
   computed: {
@@ -153,7 +166,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 +207,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 +220,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
       });
     },
@@ -237,30 +260,35 @@ var _default2 = baseMixins.extend({
       return _objectSpread(_objectSpread({}, defaultMenuProps), {}, {
         eager: this.eager,
         modelValue: this.menuCanShow && this.isMenuActive,
-        nudgeBottom: normalisedProps.offsetY ? 1 : 0
+        nudgeBottom: normalisedProps.offsetY ? 1 : 0,
+        auto: this.auto,
+        minWidth: this.minWidth
       }, normalisedProps);
     }
   },
   watch: {
-    internalValue: function internalValue(val) {
-      var _this2 = this;
+    internalValue: {
+      handler: function handler(val) {
+        var _this2 = this;
 
-      this.initialValue = val;
-      this.setSelectedItems();
+        this.initialValue = val;
+        this.setSelectedItems();
 
-      if (this.multiple) {
-        this.$nextTick(function () {
-          var _a;
+        if (this.multiple) {
+          this.$nextTick(function () {
+            var _a;
 
-          (_a = _this2.$refs.menu) === null || _a === void 0 ? void 0 : _a.updateDimensions();
-        });
-      }
+            (_a = _this2.$refs.menu) === null || _a === void 0 ? void 0 : _a.updateDimensions();
+          });
+        }
 
-      if (this.hideSelected) {
-        this.$nextTick(function () {
-          _this2.onScroll();
-        });
-      }
+        if (this.hideSelected) {
+          this.$nextTick(function () {
+            _this2.onScroll();
+          });
+        }
+      },
+      deep: true
     },
     isMenuActive: function isMenuActive(val) {
       var _this3 = this;
@@ -287,6 +315,39 @@ var _default2 = baseMixins.extend({
       }
     }
   },
+  created: function created() {
+    var _this5 = this;
+
+    var breakingProps = [['value', 'modelValue'], ['onInput', 'onUpdate:modelValue']];
+    /* istanbul ignore next */
+
+    breakingProps.forEach(function (_ref) {
+      var _ref2 = _slicedToArray(_ref, 2),
+          original = _ref2[0],
+          replacement = _ref2[1];
+
+      if (_this5.$attrs.hasOwnProperty(original)) (0, _console.breaking)(original, replacement, _this5);
+    });
+  },
+  mounted: function mounted() {
+    var _this6 = this;
+
+    this.$nextTick(function () {
+      if (_this6.$el && _this6.$el.attributes) {
+        var attrs = _this6.$el.attributes;
+
+        for (var i = 0; i < attrs.length; i++) {
+          var attr = attrs[i];
+
+          if (attr.name.startsWith('data-v-')) {
+            _this6.detectedScopeId = attr.name; // scopeId найден и сохранен для использования в dropdown
+
+            break;
+          }
+        }
+      }
+    });
+  },
   methods: {
     /** @public */
     blur: function blur(e) {
@@ -304,18 +365,19 @@ var _default2 = baseMixins.extend({
       this.isMenuActive = true;
     },
     clearableCallback: function clearableCallback() {
-      var _this5 = this;
+      var _this7 = this;
 
       this.setValue(this.multiple ? [] : null);
       this.setMenuIndex(-1);
       this.$nextTick(function () {
-        return _this5.$refs.input && _this5.$refs.input.focus();
+        return _this7.$refs.input && _this7.$refs.input.focus();
       });
       if (this.openOnClear) this.isMenuActive = true;
+      this.$emit('click:clear');
     },
     closeConditional: function closeConditional(e) {
       if (!this.isMenuActive) return true;
-      return !this._isDestroyed && ( // Click originates from outside the menu content
+      return !this.$.isUnmounted && ( // Click originates from outside the menu content
       // Multiple selects don't close when an item is clicked
       !this.getContent() || !this.getContent().contains(e.target)) && // Click originates from outside the element
       this.$el && !this.$el.contains(e.target) && e.target !== this.$el;
@@ -344,18 +406,18 @@ var _default2 = baseMixins.extend({
       return Array.from(uniqueValues.values());
     },
     findExistingIndex: function findExistingIndex(item) {
-      var _this6 = this;
+      var _this8 = this;
 
       var itemValue = this.getValue(item);
       return (this.internalValue || []).findIndex(function (i) {
-        return _this6.valueComparator(_this6.getValue(i), itemValue);
+        return _this8.valueComparator(_this8.getValue(i), itemValue);
       });
     },
     getContent: function getContent() {
       return this.$refs.menu && this.$refs.menu.$refs.content;
     },
     genChipSelection: function genChipSelection(item, index) {
-      var _this7 = this;
+      var _this9 = this;
 
       var isDisabled = this.isDisabled || this.getDisabled(item);
       var isInteractive = !isDisabled && this.isInteractive;
@@ -364,18 +426,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;
+          _this9.selectedIndex = index;
         },
         'onClick:close': function onClickClose() {
-          return _this7.onChipInput(item);
+          return _this9.onChipInput(item);
         },
         key: JSON.stringify(this.getValue(item))
-      }, this.getText(item));
+      }, function () {
+        return _this9.getText(item);
+      });
     },
     genCommaSelection: function genCommaSelection(item, index, last) {
       var color = index === this.selectedIndex && this.computedColor;
@@ -408,11 +472,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 +505,26 @@ var _default2 = baseMixins.extend({
       return input;
     },
     genHiddenInput: function genHiddenInput() {
+      var _this10 = this;
+
+      var value = this.lazyValue;
+
+      if (this.multiple && Array.isArray(value)) {
+        value = value.map(function (item) {
+          if (_typeof(item) === 'object' && item !== null) {
+            return _this10.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,24 +547,22 @@ var _default2 = baseMixins.extend({
       }
     },
     genListWithSlot: function genListWithSlot() {
-      var _this8 = this;
+      var _this11 = this;
 
-      var slots = ['prepend-item', 'no-data', 'append-item'].filter(function (slotName) {
-        return _this8.$slots[slotName];
+      var slots = Object.fromEntries(['prepend-item', 'no-data', 'append-item'].filter(function (slotName) {
+        return _this11.$slots[slotName];
       }).map(function (slotName) {
-        return (0, _vue.h)('template', {
-          slot: slotName
-        }, _this8.$slots[slotName]);
-      }); // Requires destructuring due to Vue
+        return [slotName, _this11.$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 _this12 = this;
 
       var props = this.$_menuProps;
       props.activator = this.$refs['input-slot'];
@@ -501,13 +580,15 @@ var _default2 = baseMixins.extend({
       return (0, _vue.h)(_VMenu.default, _objectSpread(_objectSpread({
         role: undefined
       }, props), {}, {
-        onInput: function onInput(val) {
-          _this9.isMenuActive = val;
-          _this9.isFocused = val;
+        'onUpdate:modelValue': function onUpdateModelValue(val) {
+          _this12.isMenuActive = val;
+          _this12.isFocused = val;
         },
         onScroll: this.onScroll,
         ref: 'menu'
-      }), [this.genList()]);
+      }), function () {
+        return [_this12.genList()];
+      });
     },
     genSelections: function genSelections() {
       var length = this.selectedItems.length;
@@ -531,16 +612,16 @@ var _default2 = baseMixins.extend({
       }, children);
     },
     genSlotSelection: function genSlotSelection(item, index) {
-      var _this10 = this;
+      var _this13 = this;
 
       return this.$slots.selection({
         class: 'v-chip--select',
         parent: this,
         item: item,
         index: index,
-        select: function select(e) {
+        onSelect: function onSelect(e) {
           e.stopPropagation();
-          _this10.selectedIndex = index;
+          _this13.selectedIndex = index;
         },
         selected: index === this.selectedIndex,
         disabled: !this.isInteractive
@@ -596,7 +677,7 @@ var _default2 = baseMixins.extend({
       }
     },
     onKeyPress: function onKeyPress(e) {
-      var _this11 = this;
+      var _this14 = 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
@@ -612,8 +693,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 = _this14.getText(item)) !== null && _a !== void 0 ? _a : '').toString();
+        return text.toLowerCase().startsWith(_this14.keyboardLookupPrefix);
       });
       var item = this.allItems[index];
 
@@ -621,15 +702,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 _this14.$refs.menu.getTiles();
         });
         setTimeout(function () {
-          return _this11.setMenuIndex(index);
+          return _this14.setMenuIndex(index);
         });
       }
     },
     onKeyDown: function onKeyDown(e) {
-      var _this12 = this;
+      var _this15 = this;
 
       if (this.isReadonly && e.keyCode !== _helpers.keyCodes.tab) return;
       var keyCode = e.keyCode;
@@ -642,7 +723,7 @@ var _default2 = baseMixins.extend({
         this.$nextTick(function () {
           menu.changeListIndex(e);
 
-          _this12.$emit('update:list-index', menu.listIndex);
+          _this15.$emit('update:list-index', menu.listIndex);
         });
       } // If enter, space, open menu
 
@@ -678,7 +759,7 @@ var _default2 = baseMixins.extend({
       }
     },
     onMouseUp: function onMouseUp(e) {
-      var _this13 = this;
+      var _this16 = this;
 
       // eslint-disable-next-line sonarjs/no-collapsible-if
       if (this.hasMouseDown && e.which !== 3 && this.isInteractive) {
@@ -687,7 +768,7 @@ var _default2 = baseMixins.extend({
         // or inside, toggle menu
         if (this.isAppendInner(e.target)) {
           this.$nextTick(function () {
-            return _this13.isMenuActive = !_this13.isMenuActive;
+            return _this16.isMenuActive = !_this16.isMenuActive;
           });
         }
       }
@@ -695,11 +776,11 @@ var _default2 = baseMixins.extend({
       _VTextField2.default.methods.onMouseUp.call(this, e);
     },
     onScroll: function onScroll() {
-      var _this14 = this;
+      var _this17 = this;
 
       if (!this.isMenuActive) {
         requestAnimationFrame(function () {
-          var content = _this14.getContent();
+          var content = _this17.getContent();
 
           if (content) content.scrollTop = 0;
         });
@@ -733,7 +814,7 @@ var _default2 = baseMixins.extend({
       }
     },
     onUpDown: function onUpDown(e) {
-      var _this15 = this;
+      var _this18 = this;
 
       var menu = this.$refs.menu;
       if (!menu) return;
@@ -748,7 +829,7 @@ var _default2 = baseMixins.extend({
       menu.isBooted = true;
       window.requestAnimationFrame(function () {
         menu.getTiles();
-        if (!menu.hasClickableTiles) return _this15.activateMenu();
+        if (!menu.hasClickableTiles) return _this18.activateMenu();
 
         switch (keyCode) {
           case _helpers.keyCodes.up:
@@ -768,11 +849,11 @@ var _default2 = baseMixins.extend({
             break;
         }
 
-        _this15.selectItem(_this15.allItems[_this15.getMenuIndex()]);
+        _this18.selectItem(_this18.allItems[_this18.getMenuIndex()]);
       });
     },
     selectItem: function selectItem(item) {
-      var _this16 = this;
+      var _this19 = this;
 
       if (!this.multiple) {
         this.setValue(this.returnObject ? item : this.getValue(item));
@@ -782,7 +863,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 _this19.returnObject ? i : _this19.getValue(i);
         })); // There is no item to re-highlight
         // when selections are hidden
 
@@ -793,10 +874,10 @@ var _default2 = baseMixins.extend({
 
           if (~index) {
             this.$nextTick(function () {
-              return _this16.$refs.menu.getTiles();
+              return _this19.$refs.menu.getTiles();
             });
             setTimeout(function () {
-              return _this16.setMenuIndex(index);
+              return _this19.setMenuIndex(index);
             });
           }
         }
@@ -806,7 +887,7 @@ var _default2 = baseMixins.extend({
       this.$refs.menu && (this.$refs.menu.listIndex = index);
     },
     setSelectedItems: function setSelectedItems() {
-      var _this17 = this;
+      var _this20 = this;
 
       var selectedItems = [];
       var values = !this.multiple || !Array.isArray(this.internalValue) ? [this.internalValue] : this.internalValue;
@@ -818,12 +899,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 = _this20.allItems.findIndex(function (v) {
+            return _this20.valueComparator(_this20.getValue(v), _this20.getValue(value));
           });
 
           if (index > -1) {
-            selectedItems.push(_this17.allItems[index]);
+            selectedItems.push(_this20.allItems[index]);
           }
         };
 
@@ -841,7 +922,6 @@ var _default2 = baseMixins.extend({
     setValue: function setValue(value) {
       if (!this.valueComparator(value, this.internalValue)) {
         this.internalValue = value;
-        this.$emit('update:modelValue', value);
       }
     },
     isAppendInner: function isAppendInner(target) {