@dimailn/vuetify 2.7.2-alpha26 → 2.7.2-alpha28

package/lib/components/VWindow/VWindowItem.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/components/VWindow/VWindowItem.ts"],"names":[],"mappings":"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","sourcesContent":["import {h, vShow, withDirectives} from 'vue'\n// Components\nimport VWindow from './VWindow'\n\n// Mixins\nimport Bootable from '../../mixins/bootable'\nimport { factory as GroupableFactory } from '../../mixins/groupable'\n\n// Directives\nimport Touch from '../../directives/touch'\n\n// Utilities\nimport { convertToUnit, getSlot } from '../../util/helpers'\nimport mixins, { ExtractVue } from '../../util/mixins'\n\n// Types\nimport { VNode, Transition } from 'vue'\n\nconst baseMixins = mixins(\n  Bootable,\n  GroupableFactory('windowGroup', 'v-window-item', 'v-window')\n)\n\ninterface options extends ExtractVue<typeof baseMixins> {\n  $el: HTMLElement\n  windowGroup: InstanceType<typeof VWindow>\n}\n\nexport default baseMixins.extend({\n  name: 'v-window-item',\n\n  directives: {\n    Touch,\n  },\n\n  props: {\n    disabled: Boolean,\n    reverseTransition: {\n      type: [Boolean, String],\n      default: undefined,\n    },\n    transition: {\n      type: [Boolean, String],\n      default: undefined,\n    },\n    value: {\n      required: false,\n    },\n  },\n\n  data () {\n    return {\n      isActive: false,\n      inTransition: false,\n    }\n  },\n\n  computed: {\n    classes (): object {\n      return this.groupClasses\n    },\n    computedTransition (): string | boolean {\n      if (!this.windowGroup.internalReverse) {\n        return typeof this.transition !== 'undefined'\n          ? this.transition || ''\n          : this.windowGroup.computedTransition\n      }\n\n      return typeof this.reverseTransition !== 'undefined'\n        ? this.reverseTransition || ''\n        : this.windowGroup.computedTransition\n    },\n  },\n\n  methods: {\n    genDefaultSlot () {\n      return getSlot(this)\n    },\n    genWindowItem () {\n      return withDirectives(h('div', {\n        class: ['v-window-item', this.classes],\n        ...this.$listeners,\n      }, this.genDefaultSlot()), [\n        [\n          vShow,\n          this.isActive\n        ]\n      ])\n    },\n    onAfterTransition () {\n      if (!this.inTransition) {\n        return\n      }\n\n      // Finalize transition state.\n      this.inTransition = false\n      if (this.windowGroup.transitionCount > 0) {\n        this.windowGroup.transitionCount--\n\n        // Remove container height if we are out of transition.\n        if (this.windowGroup.transitionCount === 0) {\n          this.windowGroup.transitionHeight = undefined\n        }\n      }\n    },\n    onBeforeTransition () {\n      if (this.inTransition) {\n        return\n      }\n\n      // Initialize transition state here.\n      this.inTransition = true\n      if (this.windowGroup.transitionCount === 0) {\n        // Set initial height for height transition.\n        this.windowGroup.transitionHeight = convertToUnit(this.windowGroup.$el.clientHeight)\n      }\n      this.windowGroup.transitionCount++\n    },\n    onTransitionCancelled () {\n      this.onAfterTransition() // This should have the same path as normal transition end.\n    },\n    onEnter (el: HTMLElement) {\n      if (!this.inTransition) {\n        return\n      }\n\n      this.$nextTick(() => {\n        // Do not set height if no transition or cancelled.\n        if (!this.computedTransition || !this.inTransition) {\n          return\n        }\n\n        // Set transition target height.\n        this.windowGroup.transitionHeight = convertToUnit(el.clientHeight)\n      })\n    },\n  },\n\n  render (): VNode {\n    return h(Transition, {\n      name: this.computedTransition,\n      // Handlers for enter windows.\n      onBeforeEnter: this.onBeforeTransition,\n      onAfterEnter: this.onAfterTransition,\n      onEnterCancelled: this.onTransitionCancelled,\n\n      // Handlers for leave windows.\n      onBeforeLeave: this.onBeforeTransition,\n      onAfterLeave: this.onAfterTransition,\n      onLeaveCancelled: this.onTransitionCancelled,\n\n      // Enter handler for height transition.\n      onEnter: this.onEnter,\n    }, {\n      default: () => this.showLazyContent(() => [this.genWindowItem()])\n    })\n  },\n})\n"],"sourceRoot":"","file":"VWindowItem.js"}
+{"version":3,"sources":["../../../src/components/VWindow/VWindowItem.ts"],"names":[],"mappings":"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","sourcesContent":["import {h, vShow, withDirectives} from 'vue'\n// Components\nimport VWindow from './VWindow'\n\n// Mixins\nimport Bootable from '../../mixins/bootable'\nimport { factory as GroupableFactory } from '../../mixins/groupable'\n\n// Directives\nimport Touch from '../../directives/touch'\n\n// Utilities\nimport { convertToUnit, getSlot } from '../../util/helpers'\nimport mixins, { ExtractVue } from '../../util/mixins'\n\n// Types\nimport { VNode, Transition } from 'vue'\n\nconst baseMixins = mixins(\n  Bootable,\n  GroupableFactory('windowGroup', 'v-window-item', 'v-window')\n)\n\ninterface options extends ExtractVue<typeof baseMixins> {\n  $el: HTMLElement\n  windowGroup: InstanceType<typeof VWindow>\n}\n\nexport default baseMixins.extend({\n  name: 'v-window-item',\n\n  emits: ['change'],\n\n\n  props: {\n    disabled: Boolean,\n    reverseTransition: {\n      type: [Boolean, String],\n      default: undefined,\n    },\n    transition: {\n      type: [Boolean, String],\n      default: undefined,\n    },\n    value: {\n      required: false,\n    },\n  },\n\n  data () {\n    return {\n      isActive: false,\n      inTransition: false,\n    }\n  },\n\n  computed: {\n    classes (): object {\n      return this.groupClasses\n    },\n    computedTransition (): string | boolean {\n      if (!this.windowGroup.internalReverse) {\n        return typeof this.transition !== 'undefined'\n          ? this.transition || ''\n          : this.windowGroup.computedTransition\n      }\n\n      return typeof this.reverseTransition !== 'undefined'\n        ? this.reverseTransition || ''\n        : this.windowGroup.computedTransition\n    },\n  },\n\n  methods: {\n    genDefaultSlot () {\n      return getSlot(this)\n    },\n    genWindowItem () {\n      return withDirectives(h('div', {\n        class: ['v-window-item', this.classes],\n        ...this.$listeners,\n      }, this.genDefaultSlot()), [\n        [\n          vShow,\n          this.isActive\n        ]\n      ])\n    },\n    onAfterTransition () {\n      if (!this.inTransition) {\n        return\n      }\n\n      // Finalize transition state.\n      this.inTransition = false\n      if (this.windowGroup.transitionCount > 0) {\n        this.windowGroup.transitionCount--\n\n        // Remove container height if we are out of transition.\n        if (this.windowGroup.transitionCount === 0) {\n          this.windowGroup.transitionHeight = undefined\n        }\n      }\n    },\n    onBeforeTransition () {\n      if (this.inTransition) {\n        return\n      }\n\n      // Initialize transition state here.\n      this.inTransition = true\n      if (this.windowGroup.transitionCount === 0) {\n        // Set initial height for height transition.\n        this.windowGroup.transitionHeight = convertToUnit(this.windowGroup.$el.clientHeight)\n      }\n      this.windowGroup.transitionCount++\n    },\n    onTransitionCancelled () {\n      this.onAfterTransition() // This should have the same path as normal transition end.\n    },\n    onEnter (el: HTMLElement) {\n      if (!this.inTransition) {\n        return\n      }\n\n      this.$nextTick(() => {\n        // Do not set height if no transition or cancelled.\n        if (!this.computedTransition || !this.inTransition) {\n          return\n        }\n\n        // Set transition target height.\n        this.windowGroup.transitionHeight = convertToUnit(el.clientHeight)\n      })\n    },\n  },\n\n  render (): VNode {\n    return h(Transition, {\n      name: this.computedTransition,\n      // Handlers for enter windows.\n      onBeforeEnter: this.onBeforeTransition,\n      onAfterEnter: this.onAfterTransition,\n      onEnterCancelled: this.onTransitionCancelled,\n\n      // Handlers for leave windows.\n      onBeforeLeave: this.onBeforeTransition,\n      onAfterLeave: this.onAfterTransition,\n      onLeaveCancelled: this.onTransitionCancelled,\n\n      // Enter handler for height transition.\n      onEnter: this.onEnter,\n    }, {\n      default: () => this.showLazyContent(() => [this.genWindowItem()])\n    })\n  },\n})\n"],"sourceRoot":"","file":"VWindowItem.js"}

package/lib/framework.js

@@ -46,7 +46,7 @@ export default class Vuetify {
 }
 Vuetify.install = install;
 Vuetify.installed = false;
-Vuetify.version = "2.7.2-alpha26";
+Vuetify.version = "2.7.2-alpha28";
 Vuetify.config = {
   silent: false
 };

package/lib/mixins/detachable/index.js

@@ -98,11 +98,15 @@ export default mixins(Bootable).extend({
 
   methods: {
     getScopeIdAttrs() {
-      // В Vue 3 $vnode больше не существует, используем современный способ
-      const scopeId = this.$options._scopeId || this.$options.__scopeId;
-      return scopeId && {
-        [scopeId]: ''
-      };
+      if (!this.$attrs) return {};
+      const scopeIdAttrs = {}; // Ищем все data-v- атрибуты в $attrs
+
+      Object.keys(this.$attrs).forEach(key => {
+        if (key.startsWith('data-v-')) {
+          scopeIdAttrs[key] = '';
+        }
+      });
+      return scopeIdAttrs;
     },
 
     initDetach() {

package/lib/mixins/detachable/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/mixins/detachable/index.ts"],"names":[],"mappings":"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","sourcesContent":["// Mixins\nimport Bootable from '../bootable'\n\n// Utilities\nimport { getObjectValueByPath } from '../../util/helpers'\nimport mixins, { ExtractVue } from '../../util/mixins'\nimport { consoleWarn } from '../../util/console'\n\n// Types\nimport { PropOptions } from 'vue'\nimport { VNode } from 'vue/types'\n\ninterface options {\n  $el: HTMLElement\n  $refs: {\n    content?: HTMLElement\n  }\n}\n\nfunction validateAttachTarget (val: any) {\n  const type = typeof val\n\n  if (type === 'boolean' || type === 'string') return true\n\n  return val.nodeType === Node.ELEMENT_NODE\n}\n\nfunction removeActivator (activator: VNode[]) {\n  activator.forEach(node => {\n    node.el &&\n    node.el.parentNode &&\n    node.el.parentNode.removeChild(node.el)\n  })\n}\n\n/* @vue/component */\nexport default mixins<options &\n  /* eslint-disable indent */\n  ExtractVue<typeof Bootable>\n  /* eslint-enable indent */\n>(Bootable).extend({\n  name: 'detachable',\n\n  props: {\n    attach: {\n      default: false,\n      validator: validateAttachTarget,\n    } as PropOptions<boolean | string | Element>,\n    contentClass: {\n      type: String,\n      default: '',\n    },\n  },\n\n  data: () => ({\n    activatorNode: null as null | VNode | VNode[],\n    hasDetached: false,\n  }),\n\n  watch: {\n    attach () {\n      this.hasDetached = false\n      this.initDetach()\n    },\n    hasContent () {\n      this.$nextTick(this.initDetach)\n    },\n  },\n\n  beforeMount () {\n    this.$nextTick(() => {\n      if (this.activatorNode) {\n        const activator = Array.isArray(this.activatorNode) ? this.activatorNode : [this.activatorNode]\n\n        activator.forEach(node => {\n          if (!node.el) return\n          if (!this.$el.parentNode) return\n\n          const target = this.$el === this.$el.parentNode.firstChild\n            ? this.$el\n            : this.$el.nextSibling\n\n          this.$el.parentNode.insertBefore(node.el, target)\n        })\n      }\n    })\n  },\n\n  mounted () {\n    this.hasContent && this.initDetach()\n  },\n\n  deactivated () {\n    this.isActive = false\n  },\n\n  beforeUnmount () {\n    if (\n      this.$refs.content &&\n      this.$refs.content.parentNode\n    ) {\n      this.$refs.content.parentNode.removeChild(this.$refs.content)\n    }\n  },\n\n  unmounted () {\n    if (this.activatorNode) {\n      const activator = Array.isArray(this.activatorNode) ? this.activatorNode : [this.activatorNode]\n      if (this.$el.isConnected) {\n        // Component has been destroyed but the element still exists, we must be in a transition\n        // Wait for the transition to finish before cleaning up the detached activator\n        const observer = new MutationObserver(list => {\n          if (\n            list.some(record => Array.from(record.removedNodes).includes(this.$el))\n          ) {\n            observer.disconnect()\n            removeActivator(activator)\n          }\n        })\n        observer.observe(this.$el.parentNode!, { subtree: false, childList: true })\n      } else {\n        removeActivator(activator)\n      }\n    }\n  },\n\n  methods: {\n    getScopeIdAttrs () {\n      // В Vue 3 $vnode больше не существует, используем современный способ\n      const scopeId = this.$options._scopeId || this.$options.__scopeId\n\n      return scopeId && {\n        [scopeId]: '',\n      }\n    },\n    initDetach () {\n      if (this._isDestroyed ||\n        !this.$refs.content ||\n        this.hasDetached ||\n        // Leave menu in place if attached\n        // and dev has not changed target\n        this.attach === '' || // If used as a boolean prop (<v-menu attach>)\n        this.attach === true || // If bound to a boolean (<v-menu :attach=\"true\">)\n        this.attach === 'attach' // If bound as boolean prop in pug (v-menu(attach))\n      ) return\n\n      let target\n      if (this.attach === false) {\n        // Default, detach to app\n        target = document.querySelector('[data-app]')\n      } else if (typeof this.attach === 'string') {\n        // CSS selector\n        target = document.querySelector(this.attach)\n      } else {\n        // DOM Element\n        target = this.attach\n      }\n\n      if (!target) {\n        consoleWarn(`Unable to locate target ${this.attach || '[data-app]'}`, this)\n        return\n      }\n\n      target.appendChild(this.$refs.content)\n\n      this.hasDetached = true\n    },\n  },\n})\n"],"sourceRoot":"","file":"index.js"}
+{"version":3,"sources":["../../../src/mixins/detachable/index.ts"],"names":[],"mappings":"AAAA;AACA,OAAO,QAAP,MAAqB,aAArB;AAIA,OAAO,MAAP,MAAmC,mBAAnC;AACA,SAAS,WAAT,QAA4B,oBAA5B;;AAaA,SAAS,oBAAT,CAA+B,GAA/B,EAAuC;AACrC,QAAM,IAAI,GAAG,OAAO,GAApB;AAEA,MAAI,IAAI,KAAK,SAAT,IAAsB,IAAI,KAAK,QAAnC,EAA6C,OAAO,IAAP;AAE7C,SAAO,GAAG,CAAC,QAAJ,KAAiB,IAAI,CAAC,YAA7B;AACD;;AAED,SAAS,eAAT,CAA0B,SAA1B,EAA4C;AAC1C,EAAA,SAAS,CAAC,OAAV,CAAkB,IAAI,IAAG;AACvB,IAAA,IAAI,CAAC,EAAL,IACA,IAAI,CAAC,EAAL,CAAQ,UADR,IAEA,IAAI,CAAC,EAAL,CAAQ,UAAR,CAAmB,WAAnB,CAA+B,IAAI,CAAC,EAApC,CAFA;AAGD,GAJD;AAKD;AAED;;;AACA,eAAe,MAAM,CAInB,QAJmB,CAAN,CAIH,MAJG,CAII;AACjB,EAAA,IAAI,EAAE,YADW;AAGjB,EAAA,KAAK,EAAE;AACL,IAAA,MAAM,EAAE;AACN,MAAA,OAAO,EAAE,KADH;AAEN,MAAA,SAAS,EAAE;AAFL,KADH;AAKL,IAAA,YAAY,EAAE;AACZ,MAAA,IAAI,EAAE,MADM;AAEZ,MAAA,OAAO,EAAE;AAFG;AALT,GAHU;AAcjB,EAAA,IAAI,EAAE,OAAO;AACX,IAAA,aAAa,EAAE,IADJ;AAEX,IAAA,WAAW,EAAE;AAFF,GAAP,CAdW;AAmBjB,EAAA,KAAK,EAAE;AACL,IAAA,MAAM,GAAA;AACJ,WAAK,WAAL,GAAmB,KAAnB;AACA,WAAK,UAAL;AACD,KAJI;;AAKL,IAAA,UAAU,GAAA;AACR,WAAK,SAAL,CAAe,KAAK,UAApB;AACD;;AAPI,GAnBU;;AA6BjB,EAAA,WAAW,GAAA;AACT,SAAK,SAAL,CAAe,MAAK;AAClB,UAAI,KAAK,aAAT,EAAwB;AACtB,cAAM,SAAS,GAAG,KAAK,CAAC,OAAN,CAAc,KAAK,aAAnB,IAAoC,KAAK,aAAzC,GAAyD,CAAC,KAAK,aAAN,CAA3E;AAEA,QAAA,SAAS,CAAC,OAAV,CAAkB,IAAI,IAAG;AACvB,cAAI,CAAC,IAAI,CAAC,EAAV,EAAc;AACd,cAAI,CAAC,KAAK,GAAL,CAAS,UAAd,EAA0B;AAE1B,gBAAM,MAAM,GAAG,KAAK,GAAL,KAAa,KAAK,GAAL,CAAS,UAAT,CAAoB,UAAjC,GACX,KAAK,GADM,GAEX,KAAK,GAAL,CAAS,WAFb;AAIA,eAAK,GAAL,CAAS,UAAT,CAAoB,YAApB,CAAiC,IAAI,CAAC,EAAtC,EAA0C,MAA1C;AACD,SATD;AAUD;AACF,KAfD;AAgBD,GA9CgB;;AAgDjB,EAAA,OAAO,GAAA;AACL,SAAK,UAAL,IAAmB,KAAK,UAAL,EAAnB;AACD,GAlDgB;;AAoDjB,EAAA,WAAW,GAAA;AACT,SAAK,QAAL,GAAgB,KAAhB;AACD,GAtDgB;;AAwDjB,EAAA,aAAa,GAAA;AACX,QACE,KAAK,KAAL,CAAW,OAAX,IACA,KAAK,KAAL,CAAW,OAAX,CAAmB,UAFrB,EAGE;AACA,WAAK,KAAL,CAAW,OAAX,CAAmB,UAAnB,CAA8B,WAA9B,CAA0C,KAAK,KAAL,CAAW,OAArD;AACD;AACF,GA/DgB;;AAiEjB,EAAA,SAAS,GAAA;AACP,QAAI,KAAK,aAAT,EAAwB;AACtB,YAAM,SAAS,GAAG,KAAK,CAAC,OAAN,CAAc,KAAK,aAAnB,IAAoC,KAAK,aAAzC,GAAyD,CAAC,KAAK,aAAN,CAA3E;;AACA,UAAI,KAAK,GAAL,CAAS,WAAb,EAA0B;AACxB;AACA;AACA,cAAM,QAAQ,GAAG,IAAI,gBAAJ,CAAqB,IAAI,IAAG;AAC3C,cACE,IAAI,CAAC,IAAL,CAAU,MAAM,IAAI,KAAK,CAAC,IAAN,CAAW,MAAM,CAAC,YAAlB,EAAgC,QAAhC,CAAyC,KAAK,GAA9C,CAApB,CADF,EAEE;AACA,YAAA,QAAQ,CAAC,UAAT;AACA,YAAA,eAAe,CAAC,SAAD,CAAf;AACD;AACF,SAPgB,CAAjB;AAQA,QAAA,QAAQ,CAAC,OAAT,CAAiB,KAAK,GAAL,CAAS,UAA1B,EAAuC;AAAE,UAAA,OAAO,EAAE,KAAX;AAAkB,UAAA,SAAS,EAAE;AAA7B,SAAvC;AACD,OAZD,MAYO;AACL,QAAA,eAAe,CAAC,SAAD,CAAf;AACD;AACF;AACF,GApFgB;;AAsFjB,EAAA,OAAO,EAAE;AACP,IAAA,eAAe,GAAA;AACb,UAAI,CAAC,KAAK,MAAV,EAAkB,OAAO,EAAP;AAElB,YAAM,YAAY,GAAwB,EAA1C,CAHa,CAKb;;AACA,MAAA,MAAM,CAAC,IAAP,CAAY,KAAK,MAAjB,EAAyB,OAAzB,CAAiC,GAAG,IAAG;AACrC,YAAI,GAAG,CAAC,UAAJ,CAAe,SAAf,CAAJ,EAA+B;AAC7B,UAAA,YAAY,CAAC,GAAD,CAAZ,GAAoB,EAApB;AACD;AACF,OAJD;AAMA,aAAO,YAAP;AACD,KAdM;;AAeP,IAAA,UAAU,GAAA;AACR,UAAI,KAAK,YAAL,IACF,CAAC,KAAK,KAAL,CAAW,OADV,IAEF,KAAK,WAFH,IAGF;AACA;AACA,WAAK,MAAL,KAAgB,EALd,IAKoB;AACtB,WAAK,MAAL,KAAgB,IANd,IAMsB;AACxB,WAAK,MAAL,KAAgB,QAPlB,CAO2B;AAP3B,QAQE;AAEF,UAAI,MAAJ;;AACA,UAAI,KAAK,MAAL,KAAgB,KAApB,EAA2B;AACzB;AACA,QAAA,MAAM,GAAG,QAAQ,CAAC,aAAT,CAAuB,YAAvB,CAAT;AACD,OAHD,MAGO,IAAI,OAAO,KAAK,MAAZ,KAAuB,QAA3B,EAAqC;AAC1C;AACA,QAAA,MAAM,GAAG,QAAQ,CAAC,aAAT,CAAuB,KAAK,MAA5B,CAAT;AACD,OAHM,MAGA;AACL;AACA,QAAA,MAAM,GAAG,KAAK,MAAd;AACD;;AAED,UAAI,CAAC,MAAL,EAAa;AACX,QAAA,WAAW,CAAC,2BAA2B,KAAK,MAAL,IAAe,YAAY,EAAvD,EAA2D,IAA3D,CAAX;AACA;AACD;;AAED,MAAA,MAAM,CAAC,WAAP,CAAmB,KAAK,KAAL,CAAW,OAA9B;AAEA,WAAK,WAAL,GAAmB,IAAnB;AACD;;AA9CM;AAtFQ,CAJJ,CAAf","sourcesContent":["// Mixins\nimport Bootable from '../bootable'\n\n// Utilities\nimport { getObjectValueByPath } from '../../util/helpers'\nimport mixins, { ExtractVue } from '../../util/mixins'\nimport { consoleWarn } from '../../util/console'\n\n// Types\nimport { PropOptions } from 'vue'\nimport { VNode } from 'vue/types'\n\ninterface options {\n  $el: HTMLElement\n  $refs: {\n    content?: HTMLElement\n  }\n}\n\nfunction validateAttachTarget (val: any) {\n  const type = typeof val\n\n  if (type === 'boolean' || type === 'string') return true\n\n  return val.nodeType === Node.ELEMENT_NODE\n}\n\nfunction removeActivator (activator: VNode[]) {\n  activator.forEach(node => {\n    node.el &&\n    node.el.parentNode &&\n    node.el.parentNode.removeChild(node.el)\n  })\n}\n\n/* @vue/component */\nexport default mixins<options &\n  /* eslint-disable indent */\n  ExtractVue<typeof Bootable>\n  /* eslint-enable indent */\n>(Bootable).extend({\n  name: 'detachable',\n\n  props: {\n    attach: {\n      default: false,\n      validator: validateAttachTarget,\n    } as PropOptions<boolean | string | Element>,\n    contentClass: {\n      type: String,\n      default: '',\n    },\n  },\n\n  data: () => ({\n    activatorNode: null as null | VNode | VNode[],\n    hasDetached: false,\n  }),\n\n  watch: {\n    attach () {\n      this.hasDetached = false\n      this.initDetach()\n    },\n    hasContent () {\n      this.$nextTick(this.initDetach)\n    },\n  },\n\n  beforeMount () {\n    this.$nextTick(() => {\n      if (this.activatorNode) {\n        const activator = Array.isArray(this.activatorNode) ? this.activatorNode : [this.activatorNode]\n\n        activator.forEach(node => {\n          if (!node.el) return\n          if (!this.$el.parentNode) return\n\n          const target = this.$el === this.$el.parentNode.firstChild\n            ? this.$el\n            : this.$el.nextSibling\n\n          this.$el.parentNode.insertBefore(node.el, target)\n        })\n      }\n    })\n  },\n\n  mounted () {\n    this.hasContent && this.initDetach()\n  },\n\n  deactivated () {\n    this.isActive = false\n  },\n\n  beforeUnmount () {\n    if (\n      this.$refs.content &&\n      this.$refs.content.parentNode\n    ) {\n      this.$refs.content.parentNode.removeChild(this.$refs.content)\n    }\n  },\n\n  unmounted () {\n    if (this.activatorNode) {\n      const activator = Array.isArray(this.activatorNode) ? this.activatorNode : [this.activatorNode]\n      if (this.$el.isConnected) {\n        // Component has been destroyed but the element still exists, we must be in a transition\n        // Wait for the transition to finish before cleaning up the detached activator\n        const observer = new MutationObserver(list => {\n          if (\n            list.some(record => Array.from(record.removedNodes).includes(this.$el))\n          ) {\n            observer.disconnect()\n            removeActivator(activator)\n          }\n        })\n        observer.observe(this.$el.parentNode!, { subtree: false, childList: true })\n      } else {\n        removeActivator(activator)\n      }\n    }\n  },\n\n  methods: {\n    getScopeIdAttrs () {\n      if (!this.$attrs) return {}\n\n      const scopeIdAttrs: Record<string, any> = {}\n\n      // Ищем все data-v- атрибуты в $attrs\n      Object.keys(this.$attrs).forEach(key => {\n        if (key.startsWith('data-v-')) {\n          scopeIdAttrs[key] = ''\n        }\n      })\n\n      return scopeIdAttrs\n    },\n    initDetach () {\n      if (this._isDestroyed ||\n        !this.$refs.content ||\n        this.hasDetached ||\n        // Leave menu in place if attached\n        // and dev has not changed target\n        this.attach === '' || // If used as a boolean prop (<v-menu attach>)\n        this.attach === true || // If bound to a boolean (<v-menu :attach=\"true\">)\n        this.attach === 'attach' // If bound as boolean prop in pug (v-menu(attach))\n      ) return\n\n      let target\n      if (this.attach === false) {\n        // Default, detach to app\n        target = document.querySelector('[data-app]')\n      } else if (typeof this.attach === 'string') {\n        // CSS selector\n        target = document.querySelector(this.attach)\n      } else {\n        // DOM Element\n        target = this.attach\n      }\n\n      if (!target) {\n        consoleWarn(`Unable to locate target ${this.attach || '[data-app]'}`, this)\n        return\n      }\n\n      target.appendChild(this.$refs.content)\n\n      this.hasDetached = true\n    },\n  },\n})\n"],"sourceRoot":"","file":"index.js"}

package/lib/mixins/routable/index.js

@@ -39,7 +39,8 @@ export default defineComponent({
     classes() {
       const classes = {};
       if (this.to) return classes;
-      const activeClass = this.activeClass || this.$activeClass;
+      const activeClass = this.activeClass || ('$activeClass' in this ? this.$activeClass : undefined); // const activeClass = this.activeClass || this.$activeClass
+
       if (activeClass) classes[activeClass] = this.isActive;
       if (this.proxyClass) classes[this.proxyClass] = this.isActive;
       return classes;
@@ -52,9 +53,11 @@ export default defineComponent({
     },
 
     isClickable() {
+      var _a;
+
       if (this.notALink) return false;
       if (this.disabled) return false;
-      return Boolean(this.isLink || this.$attrs.onClick || this.$attrs['on!click'] || this.$attrs.tabindex);
+      return Boolean(this.isLink || this.$attrs.onClick || this.$attrs["on!click"] || this.$attrs.tabindex || ((_a = this.$props) === null || _a === void 0 ? void 0 : _a.onClick));
     },
 
     isLink() {

package/lib/mixins/routable/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/mixins/routable/index.ts"],"names":[],"mappings":"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","sourcesContent":["import { VNodeData, PropType, defineComponent, resolveComponent } from 'vue'\n\n// Directives\nimport Ripple, { RippleOptions } from '../../directives/ripple'\n\n// Utilities\nimport { getObjectValueByPath } from '../../util/helpers'\n\nexport default defineComponent({\n  name: 'routable',\n\n  directives: {\n    Ripple,\n  },\n\n  props: {\n    activeClass: String,\n    append: Boolean,\n    disabled: Boolean,\n    exact: {\n      type: Boolean as PropType<boolean | undefined>,\n      default: undefined,\n    },\n    exactPath: Boolean,\n    exactActiveClass: String,\n    link: Boolean,\n    href: [String, Object],\n    to: [String, Object],\n    nuxt: Boolean,\n    replace: Boolean,\n    ripple: {\n      type: [Boolean, Object],\n      default: null,\n    },\n    tag: String,\n    target: String,\n    notALink: Boolean\n  },\n\n  data: () => ({\n    isActive: false,\n    proxyClass: '',\n  }),\n\n  computed: {\n    classes (): object {\n      const classes: Record<string, boolean> = {}\n\n      if (this.to) return classes\n\n      const activeClass = this.activeClass || this.$activeClass\n\n      if (activeClass) classes[activeClass] = this.isActive\n      if (this.proxyClass) classes[this.proxyClass] = this.isActive\n\n      return classes\n    },\n    computedRipple (): RippleOptions | boolean {\n      return this.ripple ?? (!this.disabled && this.isClickable)\n    },\n    isClickable (): boolean {\n      if(this.notALink) return false\n\n      if (this.disabled) return false\n\n      return Boolean(\n        this.isLink ||\n        this.$attrs.onClick ||\n        this.$attrs['on!click'] ||\n        this.$attrs.tabindex\n      )\n    },\n    isLink (): boolean {\n      return this.to || this.href || this.link\n    },\n    styles: () => ({}),\n  },\n\n  watch: {\n    $route: 'onRouteChange',\n  },\n\n  mounted () {\n    this.onRouteChange()\n  },\n\n  methods: {\n    generateRouteLink () {\n      let exact = this.exact\n      let tag\n\n      const directives = [[\n        Ripple,\n        this.computedRipple,\n      ]]\n\n      const data: VNodeData = {\n        tabindex: 'tabindex' in this.$attrs ? this.$attrs.tabindex : undefined,\n        class: this.classes,\n        style: this.styles,\n        ...this.$listeners,\n        ...('click' in this ? { onClick: (this as any).click } : undefined), // #14447\n        ref: 'link'\n      }\n\n      if (typeof this.exact === 'undefined') {\n        exact = this.to === '/' ||\n          (this.to === Object(this.to) && this.to.path === '/')\n      }\n\n      if (this.to) {\n        // Add a special activeClass hook\n        // for component level styles\n        let activeClass = this.activeClass\n        let exactActiveClass = this.exactActiveClass || activeClass\n\n        if (this.proxyClass) {\n          activeClass = `${activeClass} ${this.proxyClass}`.trim()\n          exactActiveClass = `${exactActiveClass} ${this.proxyClass}`.trim()\n        }\n\n        tag = resolveComponent(this.nuxt ? 'nuxt-link' : 'router-link')\n        Object.assign(data, {\n          to: this.to,\n          exact,\n          exactPath: this.exactPath,\n          activeClass,\n          exactActiveClass,\n          append: this.append,\n          replace: this.replace,\n        })\n      } else {\n        tag = (this.href && 'a') || this.tag || 'div'\n\n        if (tag === 'a' && this.href) data.href = this.href\n      }\n\n      if (this.target) data.target = this.target\n\n      return { tag, data, directives }\n    },\n    onRouteChange () {\n      if (!this.to || !this.$refs.link || !this.$route) return\n      const activeClass = `${this.activeClass || ''} ${this.proxyClass || ''}`.trim()\n      const exactActiveClass = `${this.exactActiveClass || ''} ${this.proxyClass || ''}`.trim() || activeClass\n\n      const path = '_vnode.data.class.' + (this.exact ? exactActiveClass : activeClass)\n\n      this.$nextTick(() => {\n        /* istanbul ignore else */\n        if (!getObjectValueByPath(this.$refs.link, path) === this.isActive) {\n          this.toggle()\n        }\n      })\n    },\n    toggle () {\n      this.isActive = !this.isActive\n    },\n  },\n})\n"],"sourceRoot":"","file":"index.js"}
+{"version":3,"sources":["../../../src/mixins/routable/index.ts"],"names":[],"mappings":"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","sourcesContent":["import { VNodeData, PropType, defineComponent, resolveComponent } from 'vue'\n\n// Directives\nimport Ripple, { RippleOptions } from '../../directives/ripple'\n\n// Utilities\nimport { getObjectValueByPath } from '../../util/helpers'\n\nexport default defineComponent({\n  name: 'routable',\n\n  directives: {\n    Ripple,\n  },\n\n  props: {\n    activeClass: String,\n    append: Boolean,\n    disabled: Boolean,\n    exact: {\n      type: Boolean as PropType<boolean | undefined>,\n      default: undefined,\n    },\n    exactPath: Boolean,\n    exactActiveClass: String,\n    link: Boolean,\n    href: [String, Object],\n    to: [String, Object],\n    nuxt: Boolean,\n    replace: Boolean,\n    ripple: {\n      type: [Boolean, Object],\n      default: null,\n    },\n    tag: String,\n    target: String,\n    notALink: Boolean\n  },\n\n  data: () => ({\n    isActive: false,\n    proxyClass: '',\n  }),\n\n  computed: {\n    classes (): object {\n      const classes: Record<string, boolean> = {}\n\n      if (this.to) return classes\n\n      const activeClass = this.activeClass || ('$activeClass' in this ? this.$activeClass : undefined)\n      // const activeClass = this.activeClass || this.$activeClass\n\n      if (activeClass) classes[activeClass] = this.isActive\n      if (this.proxyClass) classes[this.proxyClass] = this.isActive\n\n      return classes\n    },\n    computedRipple (): RippleOptions | boolean {\n      return this.ripple ?? (!this.disabled && this.isClickable)\n    },\n    isClickable (): boolean {\n      if(this.notALink) return false\n\n      if (this.disabled) return false\n\n      return Boolean(\n        this.isLink ||\n        this.$attrs.onClick ||\n        this.$attrs[\"on!click\"] ||\n        this.$attrs.tabindex ||\n        this.$props?.onClick\n      );\n    },\n    isLink (): boolean {\n      return this.to || this.href || this.link\n    },\n    styles: () => ({}),\n  },\n\n  watch: {\n    $route: 'onRouteChange',\n  },\n\n  mounted () {\n    this.onRouteChange()\n  },\n\n  methods: {\n    generateRouteLink () {\n      let exact = this.exact\n      let tag\n\n      const directives = [[\n        Ripple,\n        this.computedRipple,\n      ]]\n\n      const data: VNodeData = {\n        tabindex: 'tabindex' in this.$attrs ? this.$attrs.tabindex : undefined,\n        class: this.classes,\n        style: this.styles,\n        ...this.$listeners,\n        ...('click' in this ? { onClick: (this as any).click } : undefined), // #14447\n        ref: 'link'\n      }\n\n      if (typeof this.exact === 'undefined') {\n        exact = this.to === '/' ||\n          (this.to === Object(this.to) && this.to.path === '/')\n      }\n\n      if (this.to) {\n        // Add a special activeClass hook\n        // for component level styles\n        let activeClass = this.activeClass\n        let exactActiveClass = this.exactActiveClass || activeClass\n\n        if (this.proxyClass) {\n          activeClass = `${activeClass} ${this.proxyClass}`.trim()\n          exactActiveClass = `${exactActiveClass} ${this.proxyClass}`.trim()\n        }\n\n        tag = resolveComponent(this.nuxt ? 'nuxt-link' : 'router-link')\n        Object.assign(data, {\n          to: this.to,\n          exact,\n          exactPath: this.exactPath,\n          activeClass,\n          exactActiveClass,\n          append: this.append,\n          replace: this.replace,\n        })\n      } else {\n        tag = (this.href && 'a') || this.tag || 'div'\n\n        if (tag === 'a' && this.href) data.href = this.href\n      }\n\n      if (this.target) data.target = this.target\n\n      return { tag, data, directives }\n    },\n    onRouteChange () {\n      if (!this.to || !this.$refs.link || !this.$route) return\n      const activeClass = `${this.activeClass || ''} ${this.proxyClass || ''}`.trim()\n      const exactActiveClass = `${this.exactActiveClass || ''} ${this.proxyClass || ''}`.trim() || activeClass\n\n      const path = '_vnode.data.class.' + (this.exact ? exactActiveClass : activeClass)\n\n      this.$nextTick(() => {\n        /* istanbul ignore else */\n        if (!getObjectValueByPath(this.$refs.link, path) === this.isActive) {\n          this.toggle()\n        }\n      })\n    },\n    toggle () {\n      this.isActive = !this.isActive\n    },\n  },\n})\n"],"sourceRoot":"","file":"index.js"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@dimailn/vuetify",
   "description": "Vue Material Component Framework",
-  "version": "2.7.2-alpha26",
+  "version": "2.7.2-alpha28",
   "author": {
     "name": "John Leider",
     "email": "john@vuetifyjs.com"

package/src/components/VAlert/VAlert.ts

@@ -31,6 +31,8 @@ export default mixins(
 ).extend({
   name: 'v-alert',
 
+  emits: ['update:modelValue'],
+
   props: {
     border: {
       type: String,
@@ -55,7 +57,6 @@ export default mixins(
       default: '$cancel',
     },
     icon: {
-      default: '',
       type: [Boolean, String],
       validator (val: boolean | string) {
         return typeof val === 'string' || val === false

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

@@ -4,12 +4,12 @@ import VApp from '../VApp'
 // Utilities
 import {
   mount,
-  Wrapper,
+  VueWrapper,
 } from '@vue/test-utils'
 
 describe('VApp.ts', () => {
   type Instance = InstanceType<typeof VApp>
-  let mountFunction: (options?: object) => Wrapper<Instance>
+  let mountFunction: (options?: object) => VueWrapper<Instance>
 
   beforeEach(() => {
     mountFunction = (options = {}) => {
@@ -21,11 +21,13 @@ describe('VApp.ts', () => {
 
   it('should match a snapshot', () => {
     const wrapper = mountFunction({
-      mocks: {
-        $vuetify: {
-          rtl: false,
-          theme: {
-            dark: false,
+      global: {
+        mocks: {
+          $vuetify: {
+            rtl: false,
+            theme: {
+              dark: false,
+            },
           },
         },
       },
@@ -36,11 +38,13 @@ describe('VApp.ts', () => {
 
   it('should have data-app attribute', () => {
     const wrapper = mountFunction({
-      mocks: {
-        $vuetify: {
-          rtl: false,
-          theme: {
-            dark: false,
+      global: {
+        mocks: {
+          $vuetify: {
+            rtl: false,
+            theme: {
+              dark: false,
+            },
           },
         },
       },
@@ -52,14 +56,16 @@ describe('VApp.ts', () => {
 
   it('should allow a custom id', () => {
     const wrapper = mountFunction({
-      propsData: {
+      props: {
         id: 'inspire',
       },
-      mocks: {
-        $vuetify: {
-          rtl: false,
-          theme: {
-            dark: false,
+      global: {
+        mocks: {
+          $vuetify: {
+            rtl: false,
+            theme: {
+              dark: false,
+            },
           },
         },
       },

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

@@ -1,8 +1,8 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`VApp.ts should allow a custom id 1`] = `
-<div data-app="true"
-     class="v-application v-application--is-ltr theme--light"
+<div class="v-application v-application--is-ltr theme--light"
+     data-app="true"
      id="inspire"
 >
   <div class="v-application--wrap">
@@ -11,8 +11,8 @@ exports[`VApp.ts should allow a custom id 1`] = `
 `;
 
 exports[`VApp.ts should match a snapshot 1`] = `
-<div data-app="true"
-     class="v-application v-application--is-ltr theme--light"
+<div class="v-application v-application--is-ltr theme--light"
+     data-app="true"
      id="app"
 >
   <div class="v-application--wrap">

package/src/components/VAppBar/VAppBar.ts

@@ -63,6 +63,8 @@ export default baseMixins.extend({
     },
   },
 
+  emits: ['update:modelValue'],
+
   data () {
     return {
       isActive: this.value,
@@ -239,9 +241,16 @@ export default baseMixins.extend({
     genBackground () {
       const render = VToolbar.methods.genBackground.call(this)
 
-      render.props = mergeProps(render.props || {}, {
-        style: { opacity: this.computedOpacity }
-      })
+      // Merge opacity style with existing props
+      if (render.props) {
+        render.props = mergeProps(render.props, {
+          style: { opacity: this.computedOpacity }
+        })
+      } else {
+        render.props = {
+          style: { opacity: this.computedOpacity }
+        }
+      }
 
       return render
     },