chore: fix known issue & improve

vuetifyjs · May 12, 2024 · 52385b1 · 52385b1
1 parent 7f3811a
commit 52385b1
Showing 1 changed file with 13 additions and 6 deletions.
diff --git a/packages/vuetify/src/labs/VTreeview/VTreeviewItem.tsx b/packages/vuetify/src/labs/VTreeview/VTreeviewItem.tsx
@@ -50,7 +50,11 @@ export const VTreeviewItem = genericComponent<VListItemSlots>()({
       root,
     } = useNestedItem(id, false)
 
-    const isActivetableGroupActivator = computed(() => (root.activatable || root.selectable) && isGroupActivator && !props.openOnClick)
+    const isActivetableGroupActivator = computed(() =>
+      (root.activatable.value || root.selectable.value) &&
+      isGroupActivator &&
+      !props.openOnClick
+    )
 
     const { densityClasses } = useDensity(props, 'v-list-item')
 
@@ -67,8 +71,11 @@ export const VTreeviewItem = genericComponent<VListItemSlots>()({
       (props.link || link.isClickable.value || (props.value != null && !!vListItemRef.value?.list))
     )
 
-    function onClick (e: MouseEvent | KeyboardEvent) {
-      if (!isActivetableGroupActivator.value && isGroupActivator) return
+    function selectItem (e: MouseEvent | KeyboardEvent) {
+      if (
+        !isClickable.value ||
+        (!isActivetableGroupActivator.value && isGroupActivator)
+      ) return
 
       if (root.activatable.value) {
         if (isActivetableGroupActivator.value) {
@@ -88,7 +95,7 @@ export const VTreeviewItem = genericComponent<VListItemSlots>()({
     function onKeyDown (e: KeyboardEvent) {
       if (e.key === 'Enter' || e.key === ' ') {
         e.preventDefault()
-        onClick(e as any as MouseEvent)
+        selectItem(e)
       }
     }
 
@@ -115,7 +122,7 @@ export const VTreeviewItem = genericComponent<VListItemSlots>()({
               densityClasses.value,
               props.class,
             ]}
-            onClick={ onClick }
+            onClick={ selectItem }
             v-ripple={ isClickable.value && props.ripple }
           >
             <>
@@ -173,7 +180,7 @@ export const VTreeviewItem = genericComponent<VListItemSlots>()({
             },
             props.class,
           ]}
-          onClick={ onClick }
+          onClick={ selectItem }
           onKeydown={ isClickable.value && onKeyDown }
         >
           {{