@dimailn/vuetify 2.7.2-alpha40 → 2.7.2-alpha42

package/src/components/VTimeline/VTimelineItem.ts

@@ -1,7 +1,7 @@
-import {h} from 'vue'
+import { h } from 'vue'
 // Types
 import mixins, { ExtractVue } from '../../util/mixins'
-import { VNode, VNodeData } from 'vue'
+import type { VNode, VNodeData } from '../../types/vue-internal'
 
 // Components
 import VTimeline from './VTimeline'
@@ -21,7 +21,7 @@ const baseMixins = mixins(
 
 type VTimelineInstance = InstanceType<typeof VTimeline>
 
-interface options extends ExtractVue<typeof baseMixins> {
+type options = ExtractVue<typeof baseMixins> & {
   timeline: VTimelineInstance
 }
 
@@ -33,7 +33,7 @@ export default baseMixins.extend({
   props: {
     color: {
       type: String,
-      default: 'primary',
+      default: 'primary'
     },
     fillDot: Boolean,
     hideDot: Boolean,
@@ -42,41 +42,43 @@ export default baseMixins.extend({
     large: Boolean,
     left: Boolean,
     right: Boolean,
-    small: Boolean,
+    small: Boolean
   },
 
   computed: {
     hasIcon (): boolean {
       return !!this.icon || !!this.$slots.icon
-    },
+    }
   },
 
   methods: {
     genBody () {
       return h('div', {
-        class: 'v-timeline-item__body',
+        class: 'v-timeline-item__body'
       }, getSlot(this))
     },
     genIcon (): VNode | VNode[] {
-      return getSlot(this, 'icon') || h(VIcon, {
+      const slot = getSlot(this, 'icon')
+      if (slot != null) return slot as VNode | VNode[]
+      return h(VIcon, {
         color: this.iconColor,
         dark: !this.theme.isDark,
         small: this.small
-      }, this.icon)
+      }, () => [this.icon])
     },
     genInnerDot () {
       const data: VNodeData = this.setBackgroundColor(this.color)
 
       return h('div', mergeData({
-        class: 'v-timeline-item__inner-dot',
+        class: 'v-timeline-item__inner-dot'
       }, data), [this.hasIcon && this.genIcon()])
     },
     genDot () {
       return h('div', {
         class: ['v-timeline-item__dot', {
           'v-timeline-item__dot--small': this.small,
-          'v-timeline-item__dot--large': this.large,
-        }],
+          'v-timeline-item__dot--large': this.large
+        }]
       }, [this.genInnerDot()])
     },
     genDivider () {
@@ -85,20 +87,20 @@ export default baseMixins.extend({
       if (!this.hideDot) children.push(this.genDot())
 
       return h('div', {
-        class: 'v-timeline-item__divider',
+        class: 'v-timeline-item__divider'
       }, children)
     },
     genOpposite () {
       return h('div', {
-        class: 'v-timeline-item__opposite',
+        class: 'v-timeline-item__opposite'
       }, getSlot(this, 'opposite'))
-    },
+    }
   },
 
   render (): VNode {
     const children = [
       this.genBody(),
-      this.genDivider(),
+      this.genDivider()
     ]
 
     if (this.$slots.opposite) children.push(this.genOpposite())
@@ -108,8 +110,8 @@ export default baseMixins.extend({
         'v-timeline-item--fill-dot': this.fillDot,
         'v-timeline-item--before': this.timeline.reverse ? this.right : this.left,
         'v-timeline-item--after': this.timeline.reverse ? this.left : this.right,
-        ...this.themeClasses,
-      }],
+        ...this.themeClasses
+      }]
     }, children)
-  },
+  }
 })

package/src/components/VTimeline/__tests__/VTimelineItem.spec.ts

@@ -3,7 +3,7 @@ import {
   mount,
   VueWrapper,
   MountingOptions,
-  enableAutoUnmount,
+  enableAutoUnmount
 } from '@vue/test-utils'
 import { h } from 'vue'
 
@@ -19,11 +19,11 @@ describe('VTimelineItem.ts', () => {
         global: {
           provide: {
             timeline: {
-              reverse: false,
-            },
-          },
+              reverse: false
+            }
+          }
         },
-        ...options,
+        ...options
       })
     }
   })
@@ -31,8 +31,8 @@ describe('VTimelineItem.ts', () => {
   it('should conditionally render dot', async () => {
     const wrapper = mountFunction({
       props: {
-        hideDot: true,
-      },
+        hideDot: true
+      }
     })
 
     expect(wrapper.html()).toMatchSnapshot()
@@ -45,20 +45,20 @@ describe('VTimelineItem.ts', () => {
   it('should conditionally render an icon or icon slot', () => {
     expect(mountFunction({
       slots: {
-        icon: () => h('div', 'foo'),
-      },
+        icon: () => h('div', 'foo')
+      }
     }).html()).toMatchSnapshot()
 
     expect(mountFunction({
-      props: { icon: 'foo' },
+      props: { icon: 'foo' }
     }).html()).toMatchSnapshot()
   })
 
   it('should render opposite slot', () => {
     const wrapper = mountFunction({
       slots: {
-        opposite: () => h('div', 'foo'),
-      },
+        opposite: () => h('div', 'foo')
+      }
     })
 
     expect(wrapper.html()).toMatchSnapshot()

package/src/components/VTimeline/index.ts

@@ -6,6 +6,6 @@ export { VTimeline, VTimelineItem }
 export default {
   $_vuetify_subcomponents: {
     VTimeline,
-    VTimelineItem,
-  },
+    VTimelineItem
+  }
 }

package/src/components/VToolbar/VToolbar.ts

@@ -28,7 +28,7 @@ export default defineComponent({
     extended: Boolean,
     extensionHeight: {
       default: 48,
-      type: [Number, String],
+      type: [Number, String]
     },
     flat: Boolean,
     floating: Boolean,
@@ -36,16 +36,16 @@ export default defineComponent({
     short: Boolean,
     src: {
       type: [String, Object] as PropType<string | srcObject>,
-      default: '',
+      default: ''
     },
     tag: {
       type: String,
-      default: 'header',
-    },
+      default: 'header'
+    }
   },
 
   data: () => ({
-    isExtended: false,
+    isExtended: false
   }),
 
   computed: {
@@ -81,7 +81,7 @@ export default defineComponent({
         'v-toolbar--extended': this.isExtended,
         'v-toolbar--flat': this.flat,
         'v-toolbar--floating': this.floating,
-        'v-toolbar--prominent': this.isProminent,
+        'v-toolbar--prominent': this.isProminent
       }
     },
     isCollapsed (): boolean {
@@ -93,9 +93,9 @@ export default defineComponent({
     styles (): object {
       return {
         ...this.measurableStyles,
-        height: convertToUnit(this.computedHeight),
+        height: convertToUnit(this.computedHeight)
       }
-    },
+    }
   },
 
   created () {
@@ -108,7 +108,7 @@ export default defineComponent({
       ['scroll-off-screen', '<v-app-bar scroll-off-screen>'],
       ['scroll-target', '<v-app-bar scroll-target>'],
       ['scroll-threshold', '<v-app-bar scroll-threshold>'],
-      ['card', '<v-app-bar flat>'],
+      ['card', '<v-app-bar flat>']
     ]
 
     /* istanbul ignore next */
@@ -121,7 +121,7 @@ export default defineComponent({
     genBackground () {
       const props = {
         height: convertToUnit(this.computedHeight),
-        src: this.src,
+        src: this.src
       }
 
       const image = this.$slots.img
@@ -129,25 +129,25 @@ export default defineComponent({
         : h(VImg, props)
 
       return h('div', {
-        class: 'v-toolbar__image',
+        class: 'v-toolbar__image'
       }, [image])
     },
     genContent () {
       return h('div', {
         class: 'v-toolbar__content',
         style: {
-          height: convertToUnit(this.computedContentHeight),
-        },
+          height: convertToUnit(this.computedContentHeight)
+        }
       }, getSlot(this))
     },
     genExtension () {
       return h('div', {
         class: 'v-toolbar__extension',
         style: {
-          height: convertToUnit(this.extensionHeight),
-        },
+          height: convertToUnit(this.extensionHeight)
+        }
       }, getSlot(this, 'extension'))
-    },
+    }
   },
 
   render (): VNode {
@@ -162,6 +162,6 @@ export default defineComponent({
     if (this.isExtended) children.push(this.genExtension())
     if (this.src || this.$slots.img) children.unshift(this.genBackground())
 
-    return h(getTagValue(this.tag), {...this.attrs$, ...data}, children)
+    return h(getTagValue(this.tag), { ...this.attrs$, ...data }, children)
   }
 })

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

@@ -7,7 +7,7 @@ import VToolbar from '../VToolbar'
 // Utilities
 import {
   mount,
-  VueWrapper,
+  VueWrapper
 } from '@vue/test-utils'
 import { enableAutoUnmount } from '@vue/test-utils'
 
@@ -24,12 +24,12 @@ describe('VToolbar.ts', () => {
           mocks: {
             $vuetify: {
               breakpoint: {
-                smAndDown: false,
-              },
-            },
-          },
+                smAndDown: false
+              }
+            }
+          }
         },
-        ...options,
+        ...options
       })
     }
   })
@@ -37,8 +37,8 @@ describe('VToolbar.ts', () => {
   it('should render an extended toolbar', () => {
     const wrapper = mountFunction({
       props: {
-        extended: true,
-      },
+        extended: true
+      }
     })
 
     expect(wrapper.html()).toMatchSnapshot()
@@ -48,8 +48,8 @@ describe('VToolbar.ts', () => {
     const wrapper = mountFunction({
       props: {
         extended: true,
-        extensionHeight: 42,
-      },
+        extensionHeight: 42
+      }
     })
 
     expect(wrapper.html()).toMatchSnapshot()
@@ -59,27 +59,27 @@ describe('VToolbar.ts', () => {
     const wrapper = mountFunction()
 
     await wrapper.setProps({
-      height: 999,
+      height: 999
     })
     expect(wrapper.vm.computedContentHeight).toBe(999)
 
     await wrapper.setProps({
       height: undefined,
-      dense: true,
+      dense: true
     })
     expect(wrapper.vm.computedContentHeight).toBe(48)
 
     await wrapper.setProps({
       height: undefined,
       dense: false,
-      prominent: true,
+      prominent: true
     })
     expect(wrapper.vm.computedContentHeight).toBe(128)
 
     await wrapper.setProps({
       height: undefined,
       dense: false,
-      prominent: false,
+      prominent: false
     })
 
     // Проверяем значение по умолчанию (smAndDown: false)
@@ -91,17 +91,17 @@ describe('VToolbar.ts', () => {
         mocks: {
           $vuetify: {
             breakpoint: {
-              smAndDown: true,
-            },
-          },
-        },
-      },
+              smAndDown: true
+            }
+          }
+        }
+      }
     })
 
     await wrapperMobile.setProps({
       height: undefined,
       dense: false,
-      prominent: false,
+      prominent: false
     })
 
     expect(wrapperMobile.vm.computedContentHeight).toBe(56)
@@ -109,7 +109,7 @@ describe('VToolbar.ts', () => {
 
   it('should have a custom extension height', () => {
     const wrapper = mountFunction({
-      props: { tabs: true },
+      props: { tabs: true }
     })
 
     expect(wrapper.vm.extensionHeight).toBe(48)
@@ -120,8 +120,8 @@ describe('VToolbar.ts', () => {
       props: {
         height: 112,
         extended: true,
-        extensionHeight: 64,
-      },
+        extensionHeight: 64
+      }
     })
 
     expect((wrapper.vm.styles as any).height).toBe('176px')

package/src/components/VToolbar/index.ts

@@ -10,13 +10,13 @@ const VToolbarItems = createSimpleFunctional('v-toolbar__items')
 export {
   VToolbar,
   VToolbarItems,
-  VToolbarTitle,
+  VToolbarTitle
 }
 
 export default {
   $_vuetify_subcomponents: {
     VToolbar,
     VToolbarItems,
-    VToolbarTitle,
-  },
+    VToolbarTitle
+  }
 }

package/src/components/VTooltip/VTooltip.ts

@@ -22,31 +22,31 @@ export default mixins(Colorable, Delayable, Dependent, Menuable).extend({
   props: {
     closeDelay: {
       type: [Number, String],
-      default: 0,
+      default: 0
     },
     disabled: Boolean,
     openDelay: {
       type: [Number, String],
-      default: 0,
+      default: 0
     },
     openOnHover: {
       type: Boolean,
-      default: true,
+      default: true
     },
     openOnFocus: {
       type: Boolean,
-      default: true,
+      default: true
     },
     tag: {
       type: String,
-      default: 'span',
+      default: 'span'
     },
-    transition: String,
+    transition: String
   },
 
   data: () => ({
     calculatedMinWidth: 0,
-    closeDependents: false,
+    closeDependents: false
   }),
 
   computed: {
@@ -109,7 +109,7 @@ export default mixins(Colorable, Delayable, Dependent, Menuable).extend({
         'v-tooltip--attached':
           this.attach === '' ||
           this.attach === true ||
-          this.attach === 'attach',
+          this.attach === 'attach'
       }
     },
     computedTransition (): string {
@@ -129,9 +129,9 @@ export default mixins(Colorable, Delayable, Dependent, Menuable).extend({
         maxWidth: convertToUnit(this.maxWidth),
         minWidth: convertToUnit(this.minWidth),
         top: this.calculatedTop,
-        zIndex: this.zIndex || this.activeZIndex,
+        zIndex: this.zIndex || this.activeZIndex
       }
-    },
+    }
   },
 
   beforeMount () {
@@ -177,7 +177,7 @@ export default mixins(Colorable, Delayable, Dependent, Menuable).extend({
     genActivatorAttributes () {
       return {
         'aria-haspopup': true,
-        'aria-expanded': String(this.isActive),
+        'aria-expanded': String(this.isActive)
       }
     },
     genTransition () {
@@ -186,7 +186,7 @@ export default mixins(Colorable, Delayable, Dependent, Menuable).extend({
       if (!this.computedTransition) return content
 
       return h(Transition, {
-        name: this.computedTransition,
+        name: this.computedTransition
       }, () => [content])
     },
     genContent () {
@@ -198,10 +198,10 @@ export default mixins(Colorable, Delayable, Dependent, Menuable).extend({
             class: ['v-tooltip__content', {
               [this.contentClass]: true,
               menuable__content__active: this.isActive,
-              'v-tooltip__content--fixed': this.activatorFixed,
+              'v-tooltip__content--fixed': this.activatorFixed
             }],
             style: this.styles,
-            ref: 'content',
+            ref: 'content'
           }),
           this.getContentSlot()
         ),
@@ -209,15 +209,15 @@ export default mixins(Colorable, Delayable, Dependent, Menuable).extend({
           [vShow, this.isContentActive]
         ]
       )
-    },
+    }
   },
 
   render (): VNode {
     return h(getTagValue(this.tag), {
-      class: ['v-tooltip', this.classes],
+      class: ['v-tooltip', this.classes]
     }, [
       this.showLazyContent(() => [this.genTransition()]),
-      this.genActivator(),
+      this.genActivator()
     ])
-  },
+  }
 })