@dimailn/vuetify 2.7.2-alpha46 → 2.7.2-alpha47

package/dist/vuetify.js

@@ -17962,12 +17962,11 @@ __webpack_require__.r(__webpack_exports__);
 /*!***************************************!*\
   !*** ./src/components/VIcon/VIcon.ts ***!
   \***************************************/
-/*! exports provided: VIconInternal, default */
+/*! exports provided: default */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "VIconInternal", function() { return VIconInternal; });
 /* harmony import */ var _VIcon_sass__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./VIcon.sass */ "./src/components/VIcon/VIcon.sass");
 /* harmony import */ var _VIcon_sass__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_VIcon_sass__WEBPACK_IMPORTED_MODULE_0__);
 /* harmony import */ var _mixins_binds_attrs__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../../mixins/binds-attrs */ "./src/mixins/binds-attrs/index.ts");
@@ -17994,6 +17993,23 @@ var __assign = undefined && undefined.__assign || function () {
   return __assign.apply(this, arguments);
 };
 
+var __values = undefined && undefined.__values || function (o) {
+  var s = typeof Symbol === "function" && Symbol.iterator,
+      m = s && o[s],
+      i = 0;
+  if (m) return m.call(o);
+  if (o && typeof o.length === "number") return {
+    next: function next() {
+      if (o && i >= o.length) o = void 0;
+      return {
+        value: o && o[i++],
+        done: !o
+      };
+    }
+  };
+  throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
+};
+
  // Mixins
 
 
@@ -18027,13 +18043,37 @@ function isSvgPath(icon) {
   return /^[mzlhvcsqta]\s*[-+.0-9][^mlhvzcsqta]+/i.test(icon) && /[\dz]$/i.test(icon) && icon.length > 4;
 }
 
-function classesToString(classObj) {
-  return Object.keys(classObj).filter(function (key) {
-    return classObj[key];
-  }).join(' ');
+function readFirstText(node) {
+  var e_1, _a;
+
+  if (!node) return '';
+  if (typeof node === 'string') return node.trim();
+  if (typeof node.children === 'string') return node.children.trim();
+
+  if (Array.isArray(node.children)) {
+    try {
+      for (var _b = __values(node.children), _c = _b.next(); !_c.done; _c = _b.next()) {
+        var child = _c.value;
+        var text = readFirstText(child);
+        if (text) return text;
+      }
+    } catch (e_1_1) {
+      e_1 = {
+        error: e_1_1
+      };
+    } finally {
+      try {
+        if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
+      } finally {
+        if (e_1) throw e_1.error;
+      }
+    }
+  }
+
+  return '';
 }
 
-var VIconInternal = Object(_util_mixins__WEBPACK_IMPORTED_MODULE_7__["default"])(_mixins_binds_attrs__WEBPACK_IMPORTED_MODULE_1__["default"], _mixins_colorable__WEBPACK_IMPORTED_MODULE_2__["default"], _mixins_sizeable__WEBPACK_IMPORTED_MODULE_3__["default"], _mixins_themeable__WEBPACK_IMPORTED_MODULE_4__["default"]
+/* harmony default export */ __webpack_exports__["default"] = (Object(_util_mixins__WEBPACK_IMPORTED_MODULE_7__["default"])(_mixins_binds_attrs__WEBPACK_IMPORTED_MODULE_1__["default"], _mixins_colorable__WEBPACK_IMPORTED_MODULE_2__["default"], _mixins_sizeable__WEBPACK_IMPORTED_MODULE_3__["default"], _mixins_themeable__WEBPACK_IMPORTED_MODULE_4__["default"]
 /* @vue/component */
 ).extend({
   name: 'v-icon',
@@ -18047,7 +18087,9 @@ var VIconInternal = Object(_util_mixins__WEBPACK_IMPORTED_MODULE_7__["default"])
       type: String,
       required: false,
       default: 'i'
-    }
+    },
+    textContent: String,
+    innerHTML: String
   },
   computed: {
     medium: function medium() {
@@ -18059,20 +18101,32 @@ var VIconInternal = Object(_util_mixins__WEBPACK_IMPORTED_MODULE_7__["default"])
   },
   methods: {
     getIcon: function getIcon() {
-      var iconName = '';
+      var e_2, _a;
 
-      if (this.$slots.default) {
-        var slotChildren = this.$slots.default();
+      var _b, _c;
 
-        if (slotChildren && slotChildren[0]) {
-          var children = slotChildren[0].children;
+      var iconName = '';
+      if (this.textContent) iconName = this.textContent.trim();else if (this.innerHTML) iconName = this.innerHTML.trim();else {
+        var slotChildren = ((_c = (_b = this.$slots).default) === null || _c === void 0 ? void 0 : _c.call(_b)) || [];
 
-          if (typeof children === 'string') {
-            iconName = children.trim();
+        try {
+          for (var slotChildren_1 = __values(slotChildren), slotChildren_1_1 = slotChildren_1.next(); !slotChildren_1_1.done; slotChildren_1_1 = slotChildren_1.next()) {
+            var child = slotChildren_1_1.value;
+            iconName = readFirstText(child);
+            if (iconName) break;
+          }
+        } catch (e_2_1) {
+          e_2 = {
+            error: e_2_1
+          };
+        } finally {
+          try {
+            if (slotChildren_1_1 && !slotChildren_1_1.done && (_a = slotChildren_1.return)) _a.call(slotChildren_1);
+          } finally {
+            if (e_2) throw e_2.error;
           }
         }
       }
-
       return Object(_util_helpers__WEBPACK_IMPORTED_MODULE_5__["remapInternalIcon"])(this, iconName);
     },
     getSize: function getSize() {
@@ -18111,36 +18165,26 @@ var VIconInternal = Object(_util_mixins__WEBPACK_IMPORTED_MODULE_7__["default"])
       return data;
     },
     applyColors: function applyColors(data) {
+      data.class = Object(_util_helpers__WEBPACK_IMPORTED_MODULE_5__["normalizeClasses"])([data.class, this.themeClasses]);
       this.setTextColor(this.color, data);
     },
     getSvgWrapperData: function getSvgWrapperData() {
       var fontSize = this.getSize();
-      var defaultData = this.getDefaultData();
-      var normalizedClasses = Object(_util_helpers__WEBPACK_IMPORTED_MODULE_5__["normalizeClasses"])([defaultData.class, this.themeClasses]);
 
-      var wrapperData = __assign({
-        class: classesToString(normalizedClasses),
-        'aria-hidden': defaultData['aria-hidden'],
-        type: defaultData.type,
+      var wrapperData = __assign(__assign({}, this.getDefaultData()), {
         style: fontSize ? {
           fontSize: fontSize,
           height: fontSize,
           width: fontSize
         } : undefined
-      }, this.listeners$);
-
-      if (this.hasClickListener && this.disabled) {
-        wrapperData.disabled = true;
-      }
+      });
 
       this.applyColors(wrapperData);
       return wrapperData;
     },
     renderFontIcon: function renderFontIcon(icon) {
-      var _a;
-
       var newChildren = [];
-      var defaultData = this.getDefaultData();
+      var data = this.getDefaultData();
       var iconType = 'material-icons'; // Material Icon delimiter is _
       // https://material.io/icons/
 
@@ -18153,34 +18197,17 @@ var VIconInternal = Object(_util_mixins__WEBPACK_IMPORTED_MODULE_7__["default"])
       } else {
         iconType = icon.slice(0, delimiterIndex);
         if (isFontAwesome5(iconType)) iconType = '';
-      } // Создаем объект классов для иконки
-
-
-      var iconClasses = (_a = {}, _a[iconType] = true, _a);
-
-      if (!isMaterialIcon) {
-        iconClasses[icon] = true;
       }
 
-      var allClasses = Object(_util_helpers__WEBPACK_IMPORTED_MODULE_5__["normalizeClasses"])([defaultData.class, this.themeClasses, iconClasses]);
+      data.class[iconType] = true;
+      data.class[icon] = !isMaterialIcon;
       var fontSize = this.getSize();
-
-      var fontData = __assign({
-        class: classesToString(allClasses),
-        'aria-hidden': defaultData['aria-hidden'],
-        type: defaultData.type,
-        style: fontSize ? {
-          fontSize: fontSize
-        } : undefined
-      }, this.listeners$);
-
-      if (this.hasClickListener && this.disabled) {
-        fontData.disabled = true;
-      }
-
-      this.applyColors(fontData);
+      if (fontSize) data.style = {
+        fontSize: fontSize
+      };
+      this.applyColors(data);
       var el = this.hasClickListener ? 'button' : Object(_util_helpers__WEBPACK_IMPORTED_MODULE_5__["getTagValue"])(this.tag);
-      return typeof el === 'string' ? Object(vue__WEBPACK_IMPORTED_MODULE_6__["h"])(el, fontData, newChildren) : Object(vue__WEBPACK_IMPORTED_MODULE_6__["h"])(el, fontData, {
+      return typeof el === 'string' ? Object(vue__WEBPACK_IMPORTED_MODULE_6__["h"])(el, data, newChildren) : Object(vue__WEBPACK_IMPORTED_MODULE_6__["h"])(el, data, {
         default: function _default() {
           return newChildren;
         }
@@ -18209,24 +18236,27 @@ var VIconInternal = Object(_util_mixins__WEBPACK_IMPORTED_MODULE_7__["default"])
       })])]);
     },
     renderSvgIconComponent: function renderSvgIconComponent(icon) {
+      var data = {
+        class: {
+          'v-icon__component': true
+        }
+      };
       var size = this.getSize();
-      var componentClasses = Object(_util_helpers__WEBPACK_IMPORTED_MODULE_5__["normalizeClasses"])([{
-        'v-icon__component': true
-      }, this.themeClasses]);
 
-      var componentData = __assign({
-        class: classesToString(componentClasses),
-        style: size ? {
+      if (size) {
+        data.style = {
           fontSize: size,
           height: size,
           width: size
-        } : undefined
-      }, icon.props);
+        };
+      }
 
-      this.applyColors(componentData);
+      this.applyColors(data);
+      var component = icon.component;
+      Object.assign(data, icon.props);
       return Object(vue__WEBPACK_IMPORTED_MODULE_6__["h"])(this.hasClickListener ? 'button' : 'span', this.getSvgWrapperData(), {
         default: function _default() {
-          return [Object(vue__WEBPACK_IMPORTED_MODULE_6__["h"])(icon.component, componentData)];
+          return [Object(vue__WEBPACK_IMPORTED_MODULE_6__["h"])(component, data)];
         }
       });
     }
@@ -18244,36 +18274,6 @@ var VIconInternal = Object(_util_mixins__WEBPACK_IMPORTED_MODULE_7__["default"])
 
     return this.renderSvgIconComponent(icon);
   }
-});
-/* harmony default export */ __webpack_exports__["default"] = (Object(vue__WEBPACK_IMPORTED_MODULE_6__["defineComponent"])({
-  name: 'v-icon',
-  $_wrapperFor: VIconInternal,
-  functional: true,
-  mounted: function mounted() {
-    this.$el.innerHTML = '';
-  },
-  render: function render() {
-    var _this = this;
-
-    var data = __assign({}, this.$attrs); // console.log(children && children[0]?.children)
-
-
-    return Object(vue__WEBPACK_IMPORTED_MODULE_6__["h"])(VIconInternal, data, {
-      default: function _default() {
-        var _a, _b, _c, _d;
-
-        var iconName = ''; // Support usage of v-text and v-html
-        // if (data.domProps) {
-
-        if ((_a = _this.$.vnode.props) === null || _a === void 0 ? void 0 : _a.textContent) {
-          iconName = _this.$.vnode.props.textContent || _this.$.vnode.props.innerHTML || iconName;
-        }
-
-        var children = (_c = (_b = _this.$slots).default) === null || _c === void 0 ? void 0 : _c.call(_b);
-        return iconName ? [iconName] : children && ((_d = children[0]) === null || _d === void 0 ? void 0 : _d.children);
-      }
-    });
-  }
 }));
 
 /***/ }),
@@ -21404,12 +21404,14 @@ var baseMixins = Object(_util_mixins__WEBPACK_IMPORTED_MODULE_12__["default"])(_
     var directives = [[_directives_resize__WEBPACK_IMPORTED_MODULE_11__["default"], this.onResize, '500']]; // console.log('vmenurender', this, this.activator, this.getActivator())
 
     return Object(vue__WEBPACK_IMPORTED_MODULE_0__["withDirectives"])(Object(vue__WEBPACK_IMPORTED_MODULE_0__["h"])('div', data, [!this.activator && this.genActivator(), this.showLazyContent(function () {
+      var transition = _this.genTransition();
+
       return [Object(vue__WEBPACK_IMPORTED_MODULE_0__["h"])(_VThemeProvider__WEBPACK_IMPORTED_MODULE_2__["VThemeProvider"], {
         root: true,
         light: _this.light,
         dark: _this.dark
       }, function () {
-        return [_this.genTransition()];
+        return [transition];
       })];
     })]), directives);
   }
@@ -37111,7 +37113,7 @@ function () {
 
   Vuetify.install = _install__WEBPACK_IMPORTED_MODULE_0__["install"];
   Vuetify.installed = false;
-  Vuetify.version = "2.7.2-alpha46";
+  Vuetify.version = "2.7.2-alpha47";
   Vuetify.config = {
     silent: false
   };