@dimailn/vuetify 2.7.2-alpha40 → 2.7.2-alpha42

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

@@ -5,7 +5,7 @@ import {
   mount,
   MountingOptions,
   VueWrapper,
-  enableAutoUnmount,
+  enableAutoUnmount
 } from '@vue/test-utils'
 import { Breakpoint } from '../../../services/breakpoint'
 import { preset } from '../../../presets/default'
@@ -28,15 +28,15 @@ describe('VDataIterator.ts', () => {
               breakpoint: new Breakpoint(preset),
               lang: new Lang(preset),
               theme: {
-                dark: false,
+                dark: false
               },
               icons: {
-                component: null,
-              },
-            },
-          },
+                component: null
+              }
+            }
+          }
         },
-        ...options,
+        ...options
       })
     }
   })
@@ -54,14 +54,14 @@ describe('VDataIterator.ts', () => {
           'foo',
           'bar',
           'baz',
-          'qux',
-        ],
+          'qux'
+        ]
       },
       slots: {
         item (props) {
           return h('div', [props.item])
-        },
-      },
+        }
+      }
     })
 
     expect(wrapper.html()).toMatchSnapshot()
@@ -71,8 +71,8 @@ describe('VDataIterator.ts', () => {
     const wrapper = mountFunction({
       props: {
         items: [],
-        serverItemsLength: 0,
-      },
+        serverItemsLength: 0
+      }
     })
 
     await wrapper.vm.$nextTick()
@@ -80,7 +80,7 @@ describe('VDataIterator.ts', () => {
 
     await wrapper.setProps({
       loading: true,
-      items: [],
+      items: []
     })
     await wrapper.vm.$nextTick()
 
@@ -89,7 +89,7 @@ describe('VDataIterator.ts', () => {
     await wrapper.setProps({
       loading: false,
       items: ['foo'],
-      search: 'something',
+      search: 'something'
     })
     await wrapper.vm.$nextTick()
 
@@ -102,15 +102,15 @@ describe('VDataIterator.ts', () => {
         itemKey: 'id',
         items: [
           { id: 1, text: 'foo' },
-          { id: 2, text: 'bar' },
-        ],
+          { id: 2, text: 'bar' }
+        ]
       },
       slots: {
         item: (props: any) => h('div', {
           id: props.item.text,
-          onClick: () => props.select(true),
-        }, [props.item.text]),
-      },
+          onClick: () => props.select(true)
+        }, [props.item.text])
+      }
     })
 
     await wrapper.vm.$nextTick()
@@ -131,15 +131,15 @@ describe('VDataIterator.ts', () => {
         itemKey: 'id',
         items: [
           { id: 1, text: 'foo' },
-          { id: 2, text: 'bar' },
-        ],
+          { id: 2, text: 'bar' }
+        ]
       },
       slots: {
         item: (props: any) => h('div', {
           id: props.item.text,
-          onClick: () => props.expand(true),
-        }, [props.item.text]),
-      },
+          onClick: () => props.expand(true)
+        }, [props.item.text])
+      }
     })
 
     await wrapper.vm.$nextTick()
@@ -157,19 +157,19 @@ describe('VDataIterator.ts', () => {
   it('should select all', async () => {
     const items = [
       { id: 'foo' },
-      { id: 'bar' },
+      { id: 'bar' }
     ]
 
     const wrapper = mountFunction({
       props: {
-        items,
+        items
       },
       slots: {
         header: (props: any) => h('div', {
           id: 'header',
-          onClick: () => props.toggleSelectAll(true),
-        }),
-      },
+          onClick: () => props.toggleSelectAll(true)
+        })
+      }
     })
 
     await wrapper.vm.$nextTick()
@@ -191,20 +191,20 @@ describe('VDataIterator.ts', () => {
       props: {
         items: [
           { id: 'foo' },
-          { id: 'bar' },
-        ],
-      },
+          { id: 'bar' }
+        ]
+      }
     })
 
     await wrapper.setProps({
-      expanded: [{ id: 'foo' }],
+      expanded: [{ id: 'foo' }]
     })
     await wrapper.vm.$nextTick()
     expect(wrapper.emitted('update:expanded')).toBeTruthy()
     expect(wrapper.emitted('update:expanded')?.slice(-1)[0]).toEqual([[{ id: 'foo' }]])
 
     await wrapper.setProps({
-      expanded: [{ id: 'bar' }],
+      expanded: [{ id: 'bar' }]
     })
     await wrapper.vm.$nextTick()
     expect(wrapper.emitted('update:expanded')?.slice(-1)[0]).toEqual([[{ id: 'bar' }]])
@@ -215,20 +215,20 @@ describe('VDataIterator.ts', () => {
       props: {
         items: [
           { id: 'foo' },
-          { id: 'bar' },
-        ],
-      },
+          { id: 'bar' }
+        ]
+      }
     })
 
     await wrapper.setProps({
-      modelValue: [{ id: 'foo' }],
+      modelValue: [{ id: 'foo' }]
     })
     await wrapper.vm.$nextTick()
     expect(wrapper.emitted('update:modelValue')).toBeTruthy()
     expect(wrapper.emitted('update:modelValue')?.slice(-1)[0]).toEqual([[{ id: 'foo' }]])
 
     await wrapper.setProps({
-      modelValue: [{ id: 'bar' }],
+      modelValue: [{ id: 'bar' }]
     })
     await wrapper.vm.$nextTick()
     expect(wrapper.emitted('update:modelValue')?.slice(-1)[0]).toEqual([[{ id: 'bar' }]])
@@ -237,60 +237,60 @@ describe('VDataIterator.ts', () => {
   it('should check if all items are selected', async () => {
     const render = jest.fn()
     const items = [
-      { id: 'foo' }, { id: 'bar' },
+      { id: 'foo' }, { id: 'bar' }
     ]
 
     const wrapper = mountFunction({
       props: {
-        items,
+        items
       },
       slots: {
-        header: render,
-      },
+        header: render
+      }
     })
 
     await wrapper.setProps({
-      modelValue: items,
+      modelValue: items
     })
     await wrapper.vm.$nextTick()
 
     expect(render).toHaveBeenLastCalledWith(expect.objectContaining({
       everyItem: true,
-      someItems: true,
+      someItems: true
     }))
   })
 
   it('should check if some items are selected', async () => {
     const render = jest.fn()
     const items = [
-      { id: 'foo' }, { id: 'bar' },
+      { id: 'foo' }, { id: 'bar' }
     ]
 
     const wrapper = mountFunction({
       props: {
-        items,
+        items
       },
       slots: {
-        header: render,
-      },
+        header: render
+      }
     })
 
     await wrapper.setProps({
-      modelValue: items.slice(1),
+      modelValue: items.slice(1)
     })
     await wrapper.vm.$nextTick()
 
     expect(render).toHaveBeenLastCalledWith(expect.objectContaining({
       everyItem: false,
-      someItems: true,
+      someItems: true
     }))
   })
 
   it('should hide footer', () => {
     const wrapper = mountFunction({
       props: {
-        hideDefaultFooter: true,
-      },
+        hideDefaultFooter: true
+      }
     })
 
     expect(wrapper.html()).toMatchSnapshot()
@@ -304,10 +304,10 @@ describe('VDataIterator.ts', () => {
           'foo',
           'bar',
           'baz',
-          'qux',
+          'qux'
         ],
-        itemsPerPage: 1,
-      },
+        itemsPerPage: 1
+      }
     })
 
     await wrapper.setProps({ itemsPerPage: 4 })

package/src/components/VDataIterator/index.ts

@@ -5,6 +5,6 @@ export { VDataIterator, VDataFooter }
 export default {
   $_vuetify_subcomponents: {
     VDataIterator,
-    VDataFooter,
-  },
+    VDataFooter
+  }
 }

package/src/components/VDataTable/MobileRow.ts

@@ -12,7 +12,7 @@ export default defineComponent({
     hideDefaultHeader: Boolean,
     index: Number,
     item: Object,
-    rtl: Boolean,
+    rtl: Boolean
   },
 
   render (): VNode {
@@ -23,7 +23,7 @@ export default defineComponent({
 
     const columns: VNode[] = props.headers.map((header: DataTableHeader) => {
       const classes = {
-        'v-data-table__mobile-row': true,
+        'v-data-table__mobile-row': true
       }
 
       const children = []
@@ -38,7 +38,7 @@ export default defineComponent({
           isMobile: true,
           header,
           index: props.index,
-          value,
+          value
         }))
       } else {
         children.push(value == null ? value : String(value))
@@ -46,14 +46,14 @@ export default defineComponent({
 
       const mobileRowChildren = [
         h('div', {
-          class: 'v-data-table__mobile-row__cell',
-        }, children),
+          class: 'v-data-table__mobile-row__cell'
+        }, children)
       ]
 
       if (header.value !== 'dataTableSelect' && !props.hideDefaultHeader) {
         mobileRowChildren.unshift(
           h('div', {
-            class: 'v-data-table__mobile-row__header',
+            class: 'v-data-table__mobile-row__header'
           }, [header.text])
         )
       }
@@ -62,5 +62,5 @@ export default defineComponent({
     })
 
     return h('tr', { ...data, class: 'v-data-table__mobile-table-row' }, columns)
-  },
+  }
 })

package/src/components/VDataTable/Row.ts

@@ -5,9 +5,14 @@ import { DataTableHeader } from 'vuetify/types'
 // Utils
 import { getObjectValueByPath, wrapInArray } from '../../util/helpers'
 
+function vnodeTag (vnode: VNode | undefined): string | undefined {
+  const t = vnode?.type
+  return typeof t === 'string' ? t : undefined
+}
+
 function needsTd (slot: VNode[] | undefined) {
   return slot!.length !== 1 ||
-    !['td', 'th'].includes(slot![0]?.tag!)
+    !['td', 'th'].includes(vnodeTag(slot![0])!)
 }
 
 export default defineComponent({
@@ -19,7 +24,7 @@ export default defineComponent({
     headers: Array as PropType<DataTableHeader[]>,
     index: Number,
     item: Object,
-    rtl: Boolean,
+    rtl: Boolean
   },
 
   render (): VNode {
@@ -39,10 +44,9 @@ export default defineComponent({
           isMobile: false,
           header,
           index: props.index,
-          value,
+          value
         })))
-      }
-      else {
+      } else {
         children.push(value == null ? value : String(value))
       }
 
@@ -54,13 +58,13 @@ export default defineComponent({
             textAlign,
             header.cellClass,
             {
-              'v-data-table__divider': header.divider,
-            },
-          ],
+              'v-data-table__divider': header.divider
+            }
+          ]
         }, children)
         : children
     })
 
     return h('tr', data, columns)
-  },
+  }
 })

package/src/components/VDataTable/RowGroup.ts

@@ -8,22 +8,22 @@ export default defineComponent({
   props: {
     modelValue: {
       type: Boolean,
-      default: true,
+      default: true
     },
     headerClass: {
       type: String,
-      default: 'v-row-group__header',
+      default: 'v-row-group__header'
     },
     contentClass: String,
     summaryClass: {
       type: String,
-      default: 'v-row-group__summary',
-    },
+      default: 'v-row-group__summary'
+    }
   },
 
   created () {
     const breakingProps = [
-      ['value', 'modelValue'],
+      ['value', 'modelValue']
     ]
 
     /* istanbul ignore next */
@@ -44,7 +44,7 @@ export default defineComponent({
 
     if (columnHeaderSlot) {
       children.push(h('tr', {
-        class: props.headerClass,
+        class: props.headerClass
       }, columnHeaderSlot))
     } else if (rowHeaderSlot) {
       children.push(...(Array.isArray(rowHeaderSlot) ? rowHeaderSlot : [rowHeaderSlot]))
@@ -56,12 +56,12 @@ export default defineComponent({
 
     if (columnSummarySlot) {
       children.push(h('tr', {
-        class: props.summaryClass,
+        class: props.summaryClass
       }, columnSummarySlot))
     } else if (rowSummarySlot) {
       children.push(...(Array.isArray(rowSummarySlot) ? rowSummarySlot : [rowSummarySlot]))
     }
 
     return h(Fragment, children)
-  },
+  }
 })