@dimailn/vuetify 2.7.2-alpha24 → 2.7.2-alpha26

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

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/mixins/picker/index.ts"],"names":[],"mappings":"AAAA;AACA,OAAO,OAAP,MAAoB,0BAApB,C,CAEA;;AACA,OAAO,SAAP,MAAsB,cAAtB;AACA,OAAO,UAAP,MAAuB,yBAAvB;AACA,OAAO,SAAP,MAAsB,cAAtB,C,CAEA;;AACA,OAAO,MAAP,MAAmB,mBAAnB;AACA,SAAS,OAAT,QAAwB,oBAAxB,C,CAEA;;AACA,SAAgB,CAAhB,QAAyB,KAAzB;AAEA,eAAe,MAAM,CACnB,SADmB,EAEnB,UAFmB,EAGnB;AACF;AAJqB,CAAN,CAKb,MALa,CAKN;AACP,EAAA,IAAI,EAAE,QADC;AAGP,EAAA,KAAK,EAAE;AACL,IAAA,IAAI,EAAE,OADD;AAEL,IAAA,SAAS,EAAE,OAFN;AAGL,IAAA,WAAW,EAAE,MAHR;AAIL,IAAA,SAAS,EAAE,OAJN;AAKL,IAAA,OAAO,EAAE,OALJ;AAML,IAAA,KAAK,EAAE;AACL,MAAA,IAAI,EAAE,CAAC,MAAD,EAAS,MAAT,CADD;AAEL,MAAA,OAAO,EAAE;AAFJ;AANF,GAHA;AAeP,EAAA,OAAO,EAAE;AACP,IAAA,cAAc,GAAA;AACZ,aAAO,IAAP;AACD,KAHM;;AAIP,IAAA,aAAa,GAAA;AACX,aAAO,IAAP;AACD,KANM;;AAOP,IAAA,oBAAoB,GAAA;AAClB,aAAO,KAAK,MAAL,CAAY,OAAZ,GAAsB,KAAK,MAAL,CAAY,OAAZ,CAAoB;AAC/C,QAAA,IAAI,EAAG,KAAa,IAD2B;AAE/C,QAAA,MAAM,EAAG,KAAa;AAFyB,OAApB,CAAtB,GAGF,OAAO,CAAC,IAAD,CAHZ;AAID,KAZM;;AAaP,IAAA,SAAS,CAAE,WAAF,EAAqB;AAC5B,YAAM,QAAQ,GAAG,EAAjB;;AAEA,UAAI,CAAC,KAAK,OAAV,EAAmB;AACjB,cAAM,KAAK,GAAG,KAAK,cAAL,EAAd;AACA,QAAA,KAAK,KAAK,QAAQ,CAAC,KAAT,GAAiB,KAAtB,CAAL;AACD;;AAED,YAAM,IAAI,GAAG,KAAK,aAAL,EAAb;AACA,MAAA,IAAI,KAAK,QAAQ,CAAC,OAAT,GAAmB,IAAxB,CAAJ;AAEA,MAAA,QAAQ,CAAC,OAAT,GAAoB,CAAC,CAAC,UAAD,EAAa,EAAb,EAAiB,CAAC,KAAK,oBAAL,EAAD,CAAjB,CAArB;AAEA,aAAO,CAAC,CAAC,OAAD,EAAU;AAChB,QAAA,KAAK,EAAE,WADS;AAEhB,QAAA,KAAK,EAAE,KAAK,WAAL,IAAoB,KAAK,KAFhB;AAGhB,QAAA,IAAI,EAAE,KAAK,IAHK;AAIhB,QAAA,SAAS,EAAE,KAAK,SAJA;AAKhB,QAAA,IAAI,EAAE,KAAK,IALK;AAMhB,QAAA,SAAS,EAAE,KAAK,SANA;AAOhB,QAAA,SAAS,EAAE,KAAK,SAPA;AAQhB,QAAA,KAAK,EAAE,KAAK,KARI;AAShB,QAAA,KAAK,EAAE,KAAK,KATI;AAUhB,QAAA,OAAO,EAAE,KAAK;AAVE,OAAV,EAWL,QAXK,CAAR;AAYD;;AAtCM;AAfF,CALM,CAAf","sourcesContent":["// Components\nimport VPicker from '../../components/VPicker'\n\n// Mixins\nimport Colorable from '../colorable'\nimport Elevatable from '../../mixins/elevatable'\nimport Themeable from '../themeable'\n\n// Utils\nimport mixins from '../../util/mixins'\nimport { getSlot } from '../../util/helpers'\n\n// Types\nimport { VNode, h } from 'vue'\n\nexport default mixins(\n  Colorable,\n  Elevatable,\n  Themeable\n/* @vue/component */\n).extend({\n  name: 'picker',\n\n  props: {\n    flat: Boolean,\n    fullWidth: Boolean,\n    headerColor: String,\n    landscape: Boolean,\n    noTitle: Boolean,\n    width: {\n      type: [Number, String],\n      default: 290,\n    },\n  },\n\n  methods: {\n    genPickerTitle (): VNode | null {\n      return null\n    },\n    genPickerBody (): VNode | null {\n      return null\n    },\n    genPickerActionsSlot () {\n      return this.$slots.default ? this.$slots.default({\n        save: (this as any).save,\n        cancel: (this as any).cancel,\n      }) : getSlot(this)\n    },\n    genPicker (staticClass: string) {\n      const children = {}\n\n      if (!this.noTitle) {\n        const title = this.genPickerTitle()\n        title && (children.title = title)\n      }\n\n      const body = this.genPickerBody()\n      body && (children.default = body)\n\n      children.actions = (h('template', {}, [this.genPickerActionsSlot()]))\n\n      return h(VPicker, {\n        class: staticClass,\n        color: this.headerColor || this.color,\n        dark: this.dark,\n        elevation: this.elevation,\n        flat: this.flat,\n        fullWidth: this.fullWidth,\n        landscape: this.landscape,\n        light: this.light,\n        width: this.width,\n        noTitle: this.noTitle\n      }, children)\n    },\n  },\n})\n"],"sourceRoot":"","file":"index.js"}
+{"version":3,"sources":["../../../src/mixins/picker/index.ts"],"names":[],"mappings":"AAAA;AACA,OAAO,OAAP,MAAoB,0BAApB,C,CAEA;;AACA,OAAO,SAAP,MAAsB,cAAtB;AACA,OAAO,UAAP,MAAuB,yBAAvB;AACA,OAAO,SAAP,MAAsB,cAAtB,C,CAEA;;AACA,OAAO,MAAP,MAAmB,mBAAnB;AACA,SAAS,OAAT,QAAwB,oBAAxB,C,CAEA;;AACA,SAAgB,CAAhB,QAAyB,KAAzB;AAEA,eAAe,MAAM,CACnB,SADmB,EAEnB,UAFmB,EAGnB;AACF;AAJqB,CAAN,CAKb,MALa,CAKN;AACP,EAAA,IAAI,EAAE,QADC;AAGP,EAAA,KAAK,EAAE;AACL,IAAA,IAAI,EAAE,OADD;AAEL,IAAA,SAAS,EAAE,OAFN;AAGL,IAAA,WAAW,EAAE,MAHR;AAIL,IAAA,SAAS,EAAE,OAJN;AAKL,IAAA,OAAO,EAAE,OALJ;AAML,IAAA,KAAK,EAAE;AACL,MAAA,IAAI,EAAE,CAAC,MAAD,EAAS,MAAT,CADD;AAEL,MAAA,OAAO,EAAE;AAFJ;AANF,GAHA;AAeP,EAAA,OAAO,EAAE;AACP,IAAA,cAAc,GAAA;AACZ,aAAO,IAAP;AACD,KAHM;;AAIP,IAAA,aAAa,GAAA;AACX,aAAO,IAAP;AACD,KANM;;AAOP,IAAA,oBAAoB,GAAA;AAClB,aAAO,KAAK,MAAL,CAAY,OAAZ,GAAsB,KAAK,MAAL,CAAY,OAAZ,CAAoB;AAC/C,QAAA,IAAI,EAAG,KAAa,IAD2B;AAE/C,QAAA,MAAM,EAAG,KAAa;AAFyB,OAApB,CAAtB,GAGF,OAAO,CAAC,IAAD,CAHZ;AAID,KAZM;;AAaP,IAAA,SAAS,CAAE,WAAF,EAAqB;AAC5B,YAAM,QAAQ,GAAwB,EAAtC;;AAEA,UAAI,CAAC,KAAK,OAAV,EAAmB;AACjB,cAAM,KAAK,GAAG,KAAK,cAAL,EAAd;AACA,QAAA,KAAK,KAAK,QAAQ,CAAC,KAAT,GAAiB,MAAM,CAAC,KAAD,CAA5B,CAAL;AACD;;AAED,YAAM,IAAI,GAAG,KAAK,aAAL,EAAb;AACA,MAAA,IAAI,KAAK,QAAQ,CAAC,OAAT,GAAmB,MAAM,CAAC,IAAD,CAA9B,CAAJ;;AAEA,MAAA,QAAQ,CAAC,OAAT,GAAmB,MAAM,CAAC,KAAK,oBAAL,EAAD,CAAzB;;AAEA,aAAO,CAAC,CAAC,OAAD,EAAU;AAChB,QAAA,KAAK,EAAE,WADS;AAEhB,QAAA,KAAK,EAAE,KAAK,WAAL,IAAoB,KAAK,KAFhB;AAGhB,QAAA,IAAI,EAAE,KAAK,IAHK;AAIhB,QAAA,SAAS,EAAE,KAAK,SAJA;AAKhB,QAAA,IAAI,EAAE,KAAK,IALK;AAMhB,QAAA,SAAS,EAAE,KAAK,SANA;AAOhB,QAAA,SAAS,EAAE,KAAK,SAPA;AAQhB,QAAA,KAAK,EAAE,KAAK,KARI;AAShB,QAAA,KAAK,EAAE,KAAK,KATI;AAUhB,QAAA,OAAO,EAAE,KAAK;AAVE,OAAV,EAWL,QAXK,CAAR;AAYD;;AAtCM;AAfF,CALM,CAAf","sourcesContent":["// Components\nimport VPicker from '../../components/VPicker'\n\n// Mixins\nimport Colorable from '../colorable'\nimport Elevatable from '../../mixins/elevatable'\nimport Themeable from '../themeable'\n\n// Utils\nimport mixins from '../../util/mixins'\nimport { getSlot } from '../../util/helpers'\n\n// Types\nimport { VNode, h } from 'vue'\n\nexport default mixins(\n  Colorable,\n  Elevatable,\n  Themeable\n/* @vue/component */\n).extend({\n  name: 'picker',\n\n  props: {\n    flat: Boolean,\n    fullWidth: Boolean,\n    headerColor: String,\n    landscape: Boolean,\n    noTitle: Boolean,\n    width: {\n      type: [Number, String],\n      default: 290,\n    },\n  },\n\n  methods: {\n    genPickerTitle (): VNode | null {\n      return null\n    },\n    genPickerBody (): VNode | null {\n      return null\n    },\n    genPickerActionsSlot () {\n      return this.$slots.default ? this.$slots.default({\n        save: (this as any).save,\n        cancel: (this as any).cancel,\n      }) : getSlot(this)\n    },\n    genPicker (staticClass: string) {\n      const children: Record<string, any> = {}\n\n      if (!this.noTitle) {\n        const title = this.genPickerTitle()\n        title && (children.title = () => [title])\n      }\n\n      const body = this.genPickerBody()\n      body && (children.default = () => [body])\n\n      children.actions = () => [this.genPickerActionsSlot()]\n\n      return h(VPicker, {\n        class: staticClass,\n        color: this.headerColor || this.color,\n        dark: this.dark,\n        elevation: this.elevation,\n        flat: this.flat,\n        fullWidth: this.fullWidth,\n        landscape: this.landscape,\n        light: this.light,\n        width: this.width,\n        noTitle: this.noTitle\n      }, children)\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-alpha24",
+  "version": "2.7.2-alpha26",
   "author": {
     "name": "John Leider",
     "email": "john@vuetifyjs.com"

package/src/components/VAppBar/VAppBarNavIcon.ts

@@ -21,6 +21,6 @@ export default defineComponent({
 
     const defaultSlot = this.$slots.default?.()
 
-    return h(VBtn, d, defaultSlot || [h(VIcon, '$menu')])
+    return h(VBtn, d, defaultSlot || (() => [h(VIcon, {}, () => '$menu')]))
   },
 })

package/src/components/VBanner/VBanner.ts

@@ -93,7 +93,7 @@ export default mixins(
         content = h(VIcon, {
           color: this.iconColor,
           size: 28
-        }, [this.icon])
+        }, () => [this.icon])
       } else {
         content = getSlot(this, 'icon')
       }
@@ -103,7 +103,7 @@ export default mixins(
         color: this.color,
         size: 40,
         onClick: this.iconClick,
-      }, [content])
+      }, () => [content])
     },
     genText () {
       return h('div', {
@@ -151,7 +151,7 @@ export default mixins(
       }],
     }
 
-    return h(VExpandTransition, [
+    return h(VExpandTransition, {}, () => [
       h(
         'div',
         this.outlined ? data : this.setBackgroundColor(this.color, data),

package/src/components/VBreadcrumbs/VBreadcrumbs.ts

@@ -46,7 +46,7 @@ export default mixins(
 
   methods: {
     genDivider () {
-      return h(VBreadcrumbsDivider, this.$slots.divider ? this.$slots.divider : this.divider)
+      return h(VBreadcrumbsDivider, {}, () => this.$slots.divider ? this.$slots.divider : this.divider)
     },
     genItems () {
       const items = []
@@ -59,7 +59,7 @@ export default mixins(
         keys.push(item.text)
 
         if (hasSlot) items.push(this.$slots.item!({ item }))
-        else items.push(h(VBreadcrumbsItem, { key: keys.join('.'), ...item }, [item.text]))
+        else items.push(h(VBreadcrumbsItem, { key: keys.join('.'), ...item }, () => [item.text]))
 
         if (i < this.items.length - 1) items.push(this.genDivider())
       }

package/src/components/VBtn/VBtn.ts

@@ -19,13 +19,11 @@ import Sizeable from '../../mixins/sizeable'
 import mixins, { ExtractVue } from '../../util/mixins'
 import { breaking } from '../../util/console'
 import { getSlot } from '../../util/helpers'
-import mergeData from '../../util/mergeData'
 
 // Types
-import { VNode, withDirectives } from 'vue'
+import { VNode, withDirectives, h } from 'vue'
 import { PropValidator, PropType } from 'vue/types/options'
 import { RippleOptions } from '../../directives/ripple'
-import {h} from 'vue'
 
 const baseMixins = mixins(
   VSheet,
@@ -42,7 +40,6 @@ interface options extends ExtractVue<typeof baseMixins> {
 
 export default baseMixins.extend({
   name: 'v-btn',
-  inheritAttrs: false,
   props: {
     activeClass: {
       type: String,
@@ -69,6 +66,8 @@ export default baseMixins.extend({
     value: null as any as PropType<any>,
   },
 
+  emits: ['click'],
+
   data: () => ({
     proxyClass: 'v-btn--active',
   }),
@@ -107,7 +106,7 @@ export default baseMixins.extend({
     computedElevation (): string | number | undefined {
       if (this.disabled) return undefined
 
-      return Elevatable.computed.computedElevation.call(this)
+      return this.elevation
     },
     computedRipple (): RippleOptions | boolean {
       const defaultRipple = this.icon || this.fab ? { circle: true } : true
@@ -161,7 +160,6 @@ export default baseMixins.extend({
       this.$emit('click', e)
       this.$emitLegacy('click', e)
 
-
       this.btnToggle && this.toggle()
     },
     genContent (): VNode {
@@ -175,7 +173,7 @@ export default baseMixins.extend({
       }, getSlot(this, 'loader') || [h(VProgressCircular, {
         indeterminate: true,
         size: 23,
-        width: 2
+        width: 2,
       })])
     },
   },
@@ -190,25 +188,35 @@ export default baseMixins.extend({
       ? this.setBackgroundColor
       : this.setTextColor
 
-    let data = {}
+    // Merge component classes with routable classes
+    const mergedClasses = {
+      ...this.classes,
+      ...linkData.class,
+    }
 
     if (tag === 'button') {
-      data.type = this.type
-      data.disabled = this.disabled
+      linkData.type = this.type
+      linkData.disabled = this.disabled
     }
-    data.value = ['string', 'number'].includes(typeof this.value)
+    linkData.value = ['string', 'number'].includes(typeof this.value)
       ? this.value
       : JSON.stringify(this.value)
 
-    data = {
-      ...data,
-      ...linkData
+    const data = {
+      ...linkData,
+      class: mergedClasses,
+      style: this.styles,
     }
 
-    data = mergeData(data, { class: this.$attrs.class })
+    // Apply color styling but preserve Vue's automatic attribute inheritance
+    const finalData = this.disabled ? data : setColor(this.color, data)
+
+    const vnode = typeof tag === 'string'
+      ? h(tag, finalData, children)
+      : h(tag, finalData, () => children)
 
     return withDirectives(
-      h(tag, this.disabled ? data : setColor(this.color, data), children),
+      vnode,
       directives
     )
   },