Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions src/runtime/components/Tree.vue
Original file line number Diff line number Diff line change
Expand Up @@ -227,10 +227,18 @@ function getItemLabel<Item extends T[number]>(item: Item): string {
return get(item, props.labelKey as string)
}

function getItemValueKey<Item extends T[number]>(item: Item): string | undefined {
const value = get(item, 'value')

if (typeof value === 'string' || typeof value === 'number') {
return String(value)
}
}

function getItemKey<Item extends T[number]>(item: Item): string {
return props.getKey
? props.getKey(item) || getItemLabel(item)
: getItemLabel(item)
? props.getKey(item) || getItemValueKey(item) || getItemLabel(item)
: getItemValueKey(item) || getItemLabel(item)
}

function getDefaultOpenedItems(item: T[number]): string[] {
Expand Down
41 changes: 41 additions & 0 deletions test/components/Tree.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,47 @@ describe('Tree', () => {
expect(await axe(wrapper.element)).toHaveNoViolations()
})

it('uses item value as the default expansion key before falling back to label', async () => {
const wrapper = await mountSuspended(Tree, {
props: {
items: [
{
label: 'references',
value: 'root-references',
defaultExpanded: true,
children: [{ label: 'nuxt.md', value: 'root-references/nuxt.md' }]
},
{
label: 'module',
value: 'module',
defaultExpanded: true,
children: [
{
label: 'references',
value: 'module/references',
defaultExpanded: true,
children: [{ label: 'querying.md', value: 'module/references/querying.md' }]
}
]
}
]
}
})

const items = wrapper.findAll('[role="treeitem"]')
const nestedReferences = items.find(item => item.text() === 'references' && item.attributes('aria-level') === '2')

expect(nestedReferences).toBeDefined()
await nestedReferences!.trigger('click')

const updatedItems = wrapper.findAll('[role="treeitem"]')
const rootReferences = updatedItems.find(item => item.text() === 'references' && item.attributes('aria-level') === '1')
const reopenedNestedReferences = updatedItems.find(item => item.text() === 'references' && item.attributes('aria-level') === '2')

expect(rootReferences?.attributes('aria-expanded')).toBe('true')
expect(reopenedNestedReferences?.attributes('aria-expanded')).toBe('false')
})

test('should have the correct types', () => {
expectEmitPayloadType('update:modelValue', () => Tree({
items: [{ label: 'foo' }, { label: 'baz' }]
Expand Down
Loading