From f20636ad47e46249d4e344c43cceda2ac5d17d9a Mon Sep 17 00:00:00 2001 From: Yuchao Wu Date: Sun, 11 Aug 2024 22:12:22 +1000 Subject: [PATCH] refactor(VList): make itemType optional in useListItems fixes #19476 --- packages/vuetify/src/components/VList/VList.tsx | 6 +++--- packages/vuetify/src/labs/VTreeview/VTreeview.tsx | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/vuetify/src/components/VList/VList.tsx b/packages/vuetify/src/components/VList/VList.tsx index fd1d33d9f38..f5c492fd9eb 100644 --- a/packages/vuetify/src/components/VList/VList.tsx +++ b/packages/vuetify/src/components/VList/VList.tsx @@ -38,7 +38,7 @@ function isPrimitive (value: unknown): value is string | number | boolean { return typeof value === 'string' || typeof value === 'number' || typeof value === 'boolean' } -function transformItem (props: ItemProps & { itemType: string }, item: any): InternalListItem { +function transformItem (props: ItemProps & { itemType?: string }, item: any): InternalListItem { const type = getPropertyFromItem(item, props.itemType, 'item') const title = isPrimitive(item) ? item : getPropertyFromItem(item, props.itemTitle) const value = getPropertyFromItem(item, props.itemValue, undefined) @@ -63,7 +63,7 @@ function transformItem (props: ItemProps & { itemType: string }, item: any): Int } } -function transformItems (props: ItemProps & { itemType: string }, items: (string | object)[]) { +function transformItems (props: ItemProps & { itemType?: string }, items: (string | object)[]) { const array: InternalListItem[] = [] for (const item of items) { @@ -73,7 +73,7 @@ function transformItems (props: ItemProps & { itemType: string }, items: (string return array } -export function useListItems (props: ItemProps & { itemType: string }) { +export function useListItems (props: ItemProps & { itemType?: string }) { const items = computed(() => transformItems(props, props.items)) return { items } diff --git a/packages/vuetify/src/labs/VTreeview/VTreeview.tsx b/packages/vuetify/src/labs/VTreeview/VTreeview.tsx index f6d3560039e..ca69507ce99 100644 --- a/packages/vuetify/src/labs/VTreeview/VTreeview.tsx +++ b/packages/vuetify/src/labs/VTreeview/VTreeview.tsx @@ -35,7 +35,7 @@ export const makeVTreeviewProps = propsFactory({ collapseIcon: '$treeviewCollapse', expandIcon: '$treeviewExpand', slim: true, - }), ['nav']), + }), ['itemType', 'nav']), }, 'VTreeview') export const VTreeview = genericComponent(