chore: fix build errors

Author: KaelWD

packages/vuetify/src/components/VDataIterator/composables/items.ts

@@ -6,6 +6,7 @@ import { getPropertyFromItem, propsFactory } from '@/util'
 import type { PropType } from 'vue'
 import type { GroupableItem } from '@/components/VDataTable/composables/group'
 import type { SelectableItem } from '@/components/VDataTable/composables/select'
+import type { InternalItem } from '@/composables/filter'
 import type { SelectItemKey } from '@/util'
 
 export interface DataIteratorItemProps {
@@ -15,7 +16,7 @@ export interface DataIteratorItemProps {
   returnObject: boolean
 }
 
-export interface DataIteratorItem<T = any> extends GroupableItem<T>, SelectableItem {
+export interface DataIteratorItem<T = any> extends Omit<InternalItem<T>, 'type'>, GroupableItem<T>, SelectableItem {
   value: unknown
 }
 

packages/vuetify/src/components/VDataTable/types.ts

@@ -45,7 +45,7 @@ export type InternalDataTableHeader = Omit<DataTableHeader, 'key' | 'value' | 'c
   children?: InternalDataTableHeader[]
 }
 
-export interface DataTableItem<T = any> extends InternalItem<T>, GroupableItem<T>, SelectableItem {
+export interface DataTableItem<T = any> extends Omit<InternalItem<T>, 'type'>, GroupableItem<T>, SelectableItem {
   key: any
   index: number
   columns: {

packages/vuetify/src/components/VList/VList.tsx

@@ -40,11 +40,9 @@ import type { VListChildrenSlots } from './VListChildren'
 import type { ItemProps, ListItem } from '@/composables/list-items'
 import type { GenericProps, SelectItemKey } from '@/util'
 
-export interface InternalListItem<T = any> extends ListItem<T> {
-  type?: 'item' | 'subheader' | 'divider'
-}
+export interface InternalListItem<T = any> extends ListItem<T> {}
 
-function transformItem (props: ItemProps & { itemType?: string }, item: any): InternalListItem {
+function transformItem (props: ItemProps, item: any): ListItem {
   const type = getPropertyFromItem(item, props.itemType, 'item')
   const title = isPrimitive(item) ? item : getPropertyFromItem(item, props.itemTitle)
   const value = isPrimitive(item) ? item : getPropertyFromItem(item, props.itemValue, undefined)
@@ -69,7 +67,7 @@ function transformItem (props: ItemProps & { itemType?: string }, item: any): In
   }
 }
 
-function transformItems (props: ItemProps & { itemType?: string }, items: (string | object)[]) {
+function transformItems (props: ItemProps, items: (string | object)[]) {
   const array: InternalListItem[] = []
 
   for (const item of items) {
@@ -79,7 +77,7 @@ function transformItems (props: ItemProps & { itemType?: string }, items: (strin
   return array
 }
 
-export function useListItems (props: ItemProps & { itemType?: string }) {
+export function useListItems (props: ItemProps) {
   const items = computed(() => transformItems(props, props.items))
 
   return { items }
@@ -114,10 +112,6 @@ export const makeVListProps = propsFactory({
   ...makeDensityProps(),
   ...makeDimensionProps(),
   ...makeElevationProps(),
-  itemType: {
-    type: String,
-    default: 'type',
-  },
   ...makeItemsProps(),
   ...makeRoundedProps(),
   ...makeTagProps(),

packages/vuetify/src/composables/__tests__/items.spec.ts renamed to packages/vuetify/src/composables/__tests__/list-items.spec.ts

@@ -4,7 +4,7 @@ import { useItems } from '../list-items'
 // Utilities
 import { deepEqual } from '@/util'
 
-describe('items', () => {
+describe('list-items', () => {
   const defaults = {
     itemTitle: 'title',
     itemValue: 'value',
@@ -24,6 +24,7 @@ describe('items', () => {
     const { items } = useItems({ ...defaults, items: ['Foo'] })
     expect(items.value).toEqual([
       {
+        type: 'item',
         title: 'Foo',
         value: 'Foo',
         props: {
@@ -39,6 +40,7 @@ describe('items', () => {
     const { items } = useItems({ ...defaults, items: [{ title: 'Foo' }] })
     expect(items.value).toEqual([
       {
+        type: 'item',
         title: 'Foo',
         value: 'Foo',
         props: {
@@ -54,6 +56,7 @@ describe('items', () => {
     const { items } = useItems({ ...defaults, itemTitle: 'text', items: [{ text: 'Foo' }] })
     expect(items.value).toEqual([
       {
+        type: 'item',
         title: 'Foo',
         value: 'Foo',
         props: {
@@ -69,6 +72,7 @@ describe('items', () => {
     const { items } = useItems({ ...defaults, itemValue: 'id', items: [{ title: 'Foo', id: 1 }] })
     expect(items.value).toEqual([
       {
+        type: 'item',
         title: 'Foo',
         value: 1,
         props: {
@@ -94,6 +98,7 @@ describe('items', () => {
     const { items } = useItems({ ...defaults, items: rawItems })
     expect(items.value).toEqual([
       {
+        type: 'item',
         title: 'Foo',
         value: 'Foo',
         props: {
@@ -102,6 +107,7 @@ describe('items', () => {
         },
         children: [
           {
+            type: 'item',
             title: 'Bar',
             value: 'Bar',
             props: {
@@ -130,6 +136,7 @@ describe('items', () => {
     const { items } = useItems({ ...defaults, itemChildren: 'labels', items: rawItems })
     expect(items.value).toEqual([
       {
+        type: 'item',
         title: 'Foo',
         value: 'Foo',
         props: {
@@ -138,6 +145,7 @@ describe('items', () => {
         },
         children: [
           {
+            type: 'item',
             title: 'Bar',
             value: 'Bar',
             props: {
@@ -171,6 +179,7 @@ describe('items', () => {
 
     expect(items.value).toEqual([
       {
+        type: 'item',
         title: 'Foo',
         value: 'Foo',
         props: {
@@ -182,6 +191,7 @@ describe('items', () => {
         raw: rawItems[0],
       },
       {
+        type: 'item',
         title: 'Bar',
         value: 'Bar',
         props: {

packages/vuetify/src/composables/list-items.ts

@@ -24,7 +24,7 @@ export interface ItemProps {
   itemValue: SelectItemKey
   itemChildren: SelectItemKey
   itemProps: SelectItemKey
-  itemType: SelectItemKey
+  itemType?: SelectItemKey
   returnObject: boolean
   valueComparator: typeof deepEqual | undefined
 }