@dimailn/vuetify 2.7.2-alpha40 → 2.7.2-alpha42

package/src/components/VDataIterator/VDataFooter.ts

@@ -6,7 +6,8 @@ import VIcon from '../VIcon'
 import VBtn from '../VBtn'
 
 // Types
-import { defineComponent, VNode, VNodeChildrenArrayContents, PropType, h } from 'vue'
+import { defineComponent, VNode, PropType, h } from 'vue'
+import type { VNodeChildrenArrayContents } from '../../types/vue-internal'
 import { DataPagination, DataOptions, DataItemsPerPageOption } from 'vuetify/types'
 import { getSlot, normalizeAttrs } from '../../util/helpers'
 
@@ -16,39 +17,39 @@ export default defineComponent({
   props: {
     options: {
       type: Object as PropType<DataOptions>,
-      required: true,
+      required: true
     },
     pagination: {
       type: Object as PropType<DataPagination>,
-      required: true,
+      required: true
     },
     itemsPerPageOptions: {
       type: Array as PropType<DataItemsPerPageOption[]>,
-      default: () => ([5, 10, 15, -1]),
+      default: () => ([5, 10, 15, -1])
     },
     prevIcon: {
       type: String,
-      default: '$prev',
+      default: '$prev'
     },
     nextIcon: {
       type: String,
-      default: '$next',
+      default: '$next'
     },
     firstIcon: {
       type: String,
-      default: '$first',
+      default: '$first'
     },
     lastIcon: {
       type: String,
-      default: '$last',
+      default: '$last'
     },
     itemsPerPageText: {
       type: String,
-      default: '$vuetify.dataFooter.itemsPerPageText',
+      default: '$vuetify.dataFooter.itemsPerPageText'
     },
     itemsPerPageAllText: {
       type: String,
-      default: '$vuetify.dataFooter.itemsPerPageAll',
+      default: '$vuetify.dataFooter.itemsPerPageAll'
     },
     showFirstLastPage: Boolean,
     showCurrentPage: Boolean,
@@ -56,12 +57,12 @@ export default defineComponent({
     disableItemsPerPage: Boolean,
     pageText: {
       type: String,
-      default: '$vuetify.dataFooter.pageText',
-    },
+      default: '$vuetify.dataFooter.pageText'
+    }
   },
 
   emits: {
-    'update:options': (options: DataOptions) => true,
+    'update:options': (options: DataOptions) => true
   },
 
   computed: {
@@ -75,7 +76,7 @@ export default defineComponent({
         if (typeof option === 'object') return option
         else return this.genDataItemsPerPageOption(option)
       })
-    },
+    }
   },
 
   methods: {
@@ -100,7 +101,7 @@ export default defineComponent({
     genDataItemsPerPageOption (option: number) {
       return {
         text: option === -1 ? this.$vuetify.lang.t(this.itemsPerPageAllText) : String(option),
-        value: option,
+        value: option
       }
     },
     genItemsPerPageSelect () {
@@ -112,7 +113,7 @@ export default defineComponent({
       if (!computedIPPO.find(ippo => ippo.value === value)) value = computedIPPO[0]
 
       return h('div', {
-        class: 'v-data-footer__select',
+        class: 'v-data-footer__select'
       }, [
         this.$vuetify.lang.t(this.itemsPerPageText),
         h(VSelect, normalizeAttrs({
@@ -123,8 +124,8 @@ export default defineComponent({
           hideDetails: true,
           auto: true,
           minWidth: '75px',
-          'onUpdate:modelValue': this.onChangeItemsPerPage,
-        })),
+          'onUpdate:modelValue': this.onChangeItemsPerPage
+        }))
       ])
     },
     genPaginationInfo () {
@@ -141,18 +142,18 @@ export default defineComponent({
 
         const pageTextSlot = getSlot(this, 'page-text', { pageStart, pageStop, itemsLength })
         children = pageTextSlot
-          ? [pageTextSlot]
+          ? [pageTextSlot as any]
           : [this.$vuetify.lang.t(this.pageText, pageStart, pageStop, itemsLength)]
       } else {
         const pageTextSlot = getSlot(this, 'page-text', { pageStart, pageStop, itemsLength })
         if (pageTextSlot) {
-          children = [pageTextSlot]
+          children = [pageTextSlot as any]
         }
       }
 
       return h('div', {
-        class: 'v-data-footer__pagination',
-      }, children)
+        class: 'v-data-footer__pagination'
+      }, children as any)
     },
     genIcon (click: Function, disabled: boolean, label: string, icon: string): VNode {
       return h(VBtn, {
@@ -162,7 +163,7 @@ export default defineComponent({
         // dark: this.dark, // TODO: add mixin
         // light: this.light // TODO: add mixin
         onClick: click,
-        'aria-label': label, // TODO: Localization
+        'aria-label': label // TODO: Localization
       }, () => [h(VIcon, {}, () => icon)])
     },
     genIcons () {
@@ -201,24 +202,24 @@ export default defineComponent({
 
       return [
         h('div', {
-          class: 'v-data-footer__icons-before',
+          class: 'v-data-footer__icons-before'
         }, before),
         this.showCurrentPage && h('span', [this.options.page.toString()]),
         h('div', {
-          class: 'v-data-footer__icons-after',
-        }, after),
+          class: 'v-data-footer__icons-after'
+        }, after)
       ]
-    },
+    }
   },
 
   render (): VNode {
     return h('div', {
-      class: 'v-data-footer',
+      class: 'v-data-footer'
     }, [
       getSlot(this, 'prepend'),
       this.genItemsPerPageSelect(),
       this.genPaginationInfo(),
-      this.genIcons(),
+      this.genIcons()
     ])
-  },
+  }
 })

package/src/components/VDataIterator/VDataIterator.ts

@@ -12,7 +12,8 @@ import { deepEqual, getObjectValueByPath, getPrefixedScopedSlots, getSlot, camel
 import { breaking, removed } from '../../util/console'
 
 // Types
-import { h, VNode, VNodeChildren, PropType, defineComponent } from 'vue'
+import { h, VNode, PropType, defineComponent } from 'vue'
+import type { VNodeChildren } from '../../types/vue-internal'
 import { DataItemProps, DataScopeProps } from 'vuetify/types'
 
 /* @vue/component */
@@ -25,41 +26,41 @@ export default defineComponent({
     ...VData.props, // TODO: filter out props not used
     itemKey: {
       type: String,
-      default: 'id',
+      default: 'id'
     },
     modelValue: {
       type: Array as PropType<any[]>,
-      default: () => [],
+      default: () => []
     },
     singleSelect: Boolean,
     expanded: {
       type: Array as PropType<any[]>,
-      default: () => [],
+      default: () => []
     },
     mobileBreakpoint: {
       ...Mobile.props.mobileBreakpoint,
-      default: 600,
+      default: 600
     },
     singleExpand: Boolean,
     loading: [Boolean, String],
     noResultsText: {
       type: String,
-      default: '$vuetify.dataIterator.noResultsText',
+      default: '$vuetify.dataIterator.noResultsText'
     },
     noDataText: {
       type: String,
-      default: '$vuetify.noDataText',
+      default: '$vuetify.noDataText'
     },
     loadingText: {
       type: String,
-      default: '$vuetify.dataIterator.loadingText',
+      default: '$vuetify.dataIterator.loadingText'
     },
     hideDefaultFooter: Boolean,
     footerProps: Object,
     selectableKey: {
       type: String,
-      default: 'isSelectable',
-    },
+      default: 'isSelectable'
+    }
   },
 
   emits: [
@@ -77,7 +78,7 @@ export default defineComponent({
     'update:group-desc',
     'pagination',
     'current-items',
-    'page-count',
+    'page-count'
   ],
 
   data: () => ({
@@ -85,7 +86,7 @@ export default defineComponent({
     expansion: {} as Record<string, boolean>,
     internalCurrentItems: [] as any[],
     shiftKeyDown: false,
-    lastEntry: -1,
+    lastEntry: -1
   }),
 
   computed: {
@@ -100,7 +101,7 @@ export default defineComponent({
     },
     selectableItems (): any[] {
       return this.internalCurrentItems.filter(item => this.isSelectable(item))
-    },
+    }
   },
 
   watch: {
@@ -113,7 +114,7 @@ export default defineComponent({
           return selection
         }, {})
       },
-      immediate: true,
+      immediate: true
     },
     selection (value: Record<string, boolean>, old: Record<string, boolean>) {
       if (deepEqual(Object.keys(value), Object.keys(old))) return
@@ -127,14 +128,14 @@ export default defineComponent({
           return expansion
         }, {})
       },
-      immediate: true,
+      immediate: true
     },
     expansion (value: Record<string, boolean>, old: Record<string, boolean>) {
       if (deepEqual(value, old)) return
       const keys = Object.keys(value).filter(k => value[k])
       const expanded = !keys.length ? [] : this.items.filter(i => keys.includes(String(getObjectValueByPath(i, this.itemKey))))
       this.$emit('update:expanded', expanded)
-    },
+    }
   },
 
   created () {
@@ -149,7 +150,7 @@ export default defineComponent({
       ['rows-per-page-items', 'footer-props.items-per-page-options'],
       ['rows-per-page-text', 'footer-props.items-per-page-text'],
       ['prev-icon', 'footer-props.prev-icon'],
-      ['next-icon', 'footer-props.next-icon'],
+      ['next-icon', 'footer-props.next-icon']
     ]
 
     /* istanbul ignore next */
@@ -161,7 +162,7 @@ export default defineComponent({
       'expand',
       'content-class',
       'content-props',
-      'content-tag',
+      'content-tag'
     ]
 
     /* istanbul ignore next */
@@ -268,11 +269,11 @@ export default defineComponent({
         isSelected: this.isSelected(item),
         expand: (v: boolean) => this.expand(item, v),
         isExpanded: this.isExpanded(item),
-        isMobile: this.isMobile,
+        isMobile: this.isMobile
       }
     },
     genEmptyWrapper (content: VNodeChildren) {
-      return h('div', content)
+      return h('div', null, content as any)
     },
     genEmpty (originalItemsLength: number, filteredItemsLength: number) {
       if (originalItemsLength === 0 && this.loading) {
@@ -299,7 +300,7 @@ export default defineComponent({
           select: this.select,
           isExpanded: this.isExpanded,
           isMobile: this.isMobile,
-          expand: this.expand,
+          expand: this.expand
         })
       }
 
@@ -319,13 +320,13 @@ export default defineComponent({
         ...this.sanitizedFooterProps,
         options: props.options,
         pagination: props.pagination,
-        onUpdateOptions: (value: any) => props.updateOptions(value),
+        onUpdateOptions: (value: any) => props.updateOptions(value)
       }
 
       const scopedSlots = getPrefixedScopedSlots('footer.', this.$slots)
 
       return h(VDataFooter, {
-        ...data,
+        ...data
       }, scopedSlots)
     },
     genDefaultScopedSlot (props: any) {
@@ -333,18 +334,18 @@ export default defineComponent({
         ...props,
         someItems: this.someItems,
         everyItem: this.everyItem,
-        toggleSelectAll: this.toggleSelectAll,
+        toggleSelectAll: this.toggleSelectAll
       }
 
       return h('div', {
-        class: 'v-data-iterator',
+        class: 'v-data-iterator'
       }, [
         getSlot(this, 'header', outerProps, true),
         this.genItems(props),
         this.genFooter(props),
-        getSlot(this, 'footer', outerProps, true),
+        getSlot(this, 'footer', outerProps, true)
       ])
-    },
+    }
   },
 
   render (): VNode {
@@ -362,9 +363,9 @@ export default defineComponent({
         this.internalCurrentItems = v
         this.$emit('current-items', v)
       },
-      onPageCount: (v: number) => this.$emit('page-count', v),
+      onPageCount: (v: number) => this.$emit('page-count', v)
     }, {
-      default: this.genDefaultScopedSlot,
+      default: this.genDefaultScopedSlot
     })
-  },
+  }
 })

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

@@ -5,7 +5,7 @@ import {
   mount,
   MountingOptions,
   VueWrapper,
-  enableAutoUnmount,
+  enableAutoUnmount
 } from '@vue/test-utils'
 import { preset } from '../../../presets/default'
 
@@ -25,16 +25,16 @@ describe('VDataFooter.ts', () => {
           mocks: {
             $vuetify: {
               icons: {
-                component: null,
+                component: null
               },
               lang: new Lang(preset),
               theme: {
-                dark: false,
-              },
-            },
-          },
+                dark: false
+              }
+            }
+          }
         },
-        ...options,
+        ...options
       })
     }
   })
@@ -45,7 +45,7 @@ describe('VDataFooter.ts', () => {
         itemsPerPageOptions: [50, 100],
         options: {
           page: 4,
-          itemsPerPage: 100,
+          itemsPerPage: 100
         },
         pagination: {
           page: 4,
@@ -53,9 +53,9 @@ describe('VDataFooter.ts', () => {
           pageStart: 1,
           pageStop: 10,
           pageCount: 10,
-          itemsLength: 100,
-        },
-      },
+          itemsLength: 100
+        }
+      }
     })
 
     expect(wrapper.html()).toMatchSnapshot()
@@ -66,7 +66,7 @@ describe('VDataFooter.ts', () => {
       props: {
         options: {
           page: 4,
-          itemsPerPage: 10,
+          itemsPerPage: 10
         },
         pagination: {
           page: 4,
@@ -74,24 +74,24 @@ describe('VDataFooter.ts', () => {
           pageStart: 1,
           pageStop: 10,
           pageCount: 10,
-          itemsLength: 100,
+          itemsLength: 100
         },
-        showFirstLastPage: true,
+        showFirstLastPage: true
       },
       global: {
         mocks: {
           $vuetify: {
             rtl: true,
             icons: {
-              component: null,
+              component: null
             },
             lang: new Lang(preset),
             theme: {
-              dark: false,
-            },
-          },
-        },
-      },
+              dark: false
+            }
+          }
+        }
+      }
     })
 
     expect(wrapper.html()).toMatchSnapshot()
@@ -102,7 +102,7 @@ describe('VDataFooter.ts', () => {
       props: {
         options: {
           page: 4,
-          itemsPerPage: 10,
+          itemsPerPage: 10
         },
         pagination: {
           page: 4,
@@ -110,10 +110,10 @@ describe('VDataFooter.ts', () => {
           pageStart: 1,
           pageStop: 10,
           pageCount: 10,
-          itemsLength: 100,
+          itemsLength: 100
         },
-        showFirstLastPage: true,
-      },
+        showFirstLastPage: true
+      }
     })
 
     expect(wrapper.html()).toMatchSnapshot()
@@ -126,7 +126,7 @@ describe('VDataFooter.ts', () => {
       props: {
         options: {
           page: 4,
-          itemsPerPage: 10,
+          itemsPerPage: 10
         },
         pagination: {
           page: 4,
@@ -134,10 +134,10 @@ describe('VDataFooter.ts', () => {
           pageStart: 1,
           pageStop: 10,
           pageCount: 10,
-          itemsLength: 100,
+          itemsLength: 100
         },
-        'onUpdate:options': mock,
-      },
+        'onUpdate:options': mock
+      }
     })
 
     wrapper.vm.onNextPage()
@@ -159,7 +159,7 @@ describe('VDataFooter.ts', () => {
       props: {
         options: {
           page: 4,
-          itemsPerPage: 10,
+          itemsPerPage: 10
         },
         pagination: {
           page: 4,
@@ -167,10 +167,10 @@ describe('VDataFooter.ts', () => {
           pageStart: 1,
           pageStop: 10,
           pageCount: 10,
-          itemsLength: 100,
+          itemsLength: 100
         },
-        showCurrentPage: true,
-      },
+        showCurrentPage: true
+      }
     })
 
     expect(wrapper.html()).toMatchSnapshot()
@@ -181,7 +181,7 @@ describe('VDataFooter.ts', () => {
       props: {
         options: {
           page: 1,
-          itemsPerPage: 10,
+          itemsPerPage: 10
         },
         pagination: {
           page: 1,
@@ -189,10 +189,10 @@ describe('VDataFooter.ts', () => {
           pageStart: 0,
           pageStop: 0,
           pageCount: 0,
-          itemsLength: 0,
+          itemsLength: 0
         },
-        showFirstLastPage: true,
-      },
+        showFirstLastPage: true
+      }
     })
 
     expect(wrapper.html()).toMatchSnapshot()