fix(VTreeview): activatable implies openOnClick=false

Author: KaelWD

packages/vuetify/src/components/VTreeview/VTreeviewChildren.tsx

@@ -8,7 +8,7 @@ import { makeDensityProps } from '@/composables/density'
 import { IconValue } from '@/composables/icons'
 
 // Utilities
-import { computed, reactive, ref, toRaw } from 'vue'
+import { computed, mergeProps, reactive, ref, toRaw } from 'vue'
 import { genericComponent, propsFactory } from '@/util'
 
 // Types
@@ -51,6 +51,7 @@ export const makeVTreeviewChildrenProps = propsFactory({
   falseIcon: IconValue,
   trueIcon: IconValue,
   returnObject: Boolean,
+  activatable: Boolean,
   selectable: Boolean,
   selectedColor: String,
   selectStrategy: [String, Function, Object] as PropType<SelectStrategyProp>,
@@ -80,7 +81,7 @@ export const VTreeviewChildren = genericComponent<new <T extends InternalListIte
       !props.disabled && (
         props.openOnClick != null
           ? props.openOnClick
-          : props.selectable
+          : props.selectable && !props.activatable
       )))
 
     async function checkChildren (item: InternalListItem) {

packages/vuetify/src/components/VTreeview/VTreeviewItem.tsx

@@ -13,7 +13,7 @@ import { IconValue } from '@/composables/icons'
 
 // Utilities
 import { computed, inject, ref, toRaw } from 'vue'
-import { genericComponent, omit, propsFactory, useRender } from '@/util'
+import { genericComponent, propsFactory, useRender } from '@/util'
 
 // Types
 import { VTreeviewSymbol } from './shared'
@@ -68,7 +68,7 @@ export const VTreeviewItem = genericComponent<VListItemSlots>()({
     }
 
     useRender(() => {
-      const listItemProps = omit(VListItem.filterProps(props), ['onClick'])
+      const listItemProps = VListItem.filterProps(props)
       const hasPrepend = slots.prepend || props.toggleIcon
 
       return (
@@ -85,7 +85,7 @@ export const VTreeviewItem = genericComponent<VListItemSlots>()({
             props.class,
           ]}
           ripple={ false }
-          onClick={ props.onClick ?? activateGroupActivator }
+          onClick={ activateGroupActivator }
         >
           {{
             ...slots,

packages/vuetify/src/components/VTreeview/__tests__/VTreeview.spec.browser.tsx

@@ -76,7 +76,7 @@ describe.each([
         />
       ))
 
-      await userEvent.click(screen.getByText(/Human Resources/))
+      await userEvent.click(screen.getByText(/Administrators/))
       expect(activated.value).toStrictEqual([])
 
       await userEvent.click(screen.getByText(/John/))
@@ -98,7 +98,7 @@ describe.each([
         />
       ))
 
-      await userEvent.click(screen.getByText(/Human Resources/))
+      await userEvent.click(screen.getByText(/Administrators/))
       expect(activated.value).toStrictEqual([])
 
       await userEvent.click(screen.getByText(/John/))
@@ -120,16 +120,16 @@ describe.each([
         />
       ))
 
-      await userEvent.click(screen.getByText(/Human Resources/))
-      expect(activated.value).toStrictEqual([1])
-
-      await userEvent.click(screen.getByText(/Core team/))
-      expect(activated.value).toStrictEqual([1, 2])
+      await userEvent.click(screen.getByText(/Administrators/))
+      expect(activated.value).toStrictEqual([3])
 
       await userEvent.click(screen.getByText(/John/))
       await userEvent.click(screen.getByText(/Kael/))
       await userEvent.click(screen.getByText(/Nekosaur/))
-      expect(activated.value).toStrictEqual([1, 2, 201, 202, 203])
+      expect(activated.value).toStrictEqual([3, 201, 202, 203])
+
+      await userEvent.click(screen.getByText(/Core team/))
+      expect(activated.value).toStrictEqual([3, 201, 202, 203, 2])
     })
 
     it('single-independent strategy', async () => {
@@ -145,16 +145,16 @@ describe.each([
         />
       ))
 
-      await userEvent.click(screen.getByText(/Human Resources/))
-      expect(activated.value).toStrictEqual([1])
-
-      await userEvent.click(screen.getByText(/Core team/))
-      expect(activated.value).toStrictEqual([2])
+      await userEvent.click(screen.getByText(/Administrators/))
+      expect(activated.value).toStrictEqual([3])
 
       await userEvent.click(screen.getByText(/John/))
       await userEvent.click(screen.getByText(/Kael/))
       await userEvent.click(screen.getByText(/Nekosaur/))
       expect(activated.value).toStrictEqual([203])
+
+      await userEvent.click(screen.getByText(/Core team/))
+      expect(activated.value).toStrictEqual([2])
     })
 
     // https://github.com/vuetifyjs/vuetify/issues/20665