Fix: dashboard: list item's action buttons don't work with 'single cl…

…ick' setting enabled
aleksey-hoffman · Aug 7, 2022 · 3d904b7 · 3d904b7
1 parent 1a51ada
commit 3d904b7
Show file tree

Hide file tree

Showing 2 changed files with 47 additions and 50 deletions.
diff --git a/src/components/DirItem.vue b/src/components/DirItem.vue
@@ -664,6 +664,8 @@ export default {
       }
     },
     handleDirItemMouseDown (event, dirItem, index) {
+      if (event.path.some(pathElement => pathElement.classList?.contains('dir-item-card__actions'))) {return}
+
       this.inputState.drag.type = 'local'
       this.inputState.drag.dirItems = this.selectedDirItems
       this.mouseDown.item = dirItem

diff --git a/src/views/Dashboard.vue b/src/views/Dashboard.vue
@@ -107,16 +107,15 @@ Copyright © 2021 - present Aleksey Hoffman. All rights reserved.
             }"
           >
             <template #actions>
-              <v-btn icon>
-                <v-icon
-                  @dblclick.prevent.stop=""
-                  @click.prevent.stop="$store.dispatch(
-                    'REMOVE_FROM_PINNED',
-                    { items: [item] }
-                  )"
-                >
-                  mdi-close
-                </v-icon>
+              <v-btn
+                icon
+                @dblclick.prevent.stop=""
+                @click.prevent.stop="$store.dispatch(
+                  'REMOVE_FROM_PINNED',
+                  { items: [item] }
+                )"
+              >
+                <v-icon>mdi-close</v-icon>
               </v-btn>
             </template>
           </dir-item>
@@ -139,16 +138,15 @@ Copyright © 2021 - present Aleksey Hoffman. All rights reserved.
             }"
           >
             <template #actions>
-              <v-btn icon>
-                <v-icon
-                  @dblclick.prevent.stop=""
-                  @click.prevent.stop="$store.dispatch(
-                    'REMOVE_FROM_PINNED',
-                    { items: [item] }
-                  )"
-                >
-                  mdi-close
-                </v-icon>
+              <v-btn
+                icon
+                @dblclick.prevent.stop=""
+                @click.prevent.stop="$store.dispatch(
+                  'REMOVE_FROM_PINNED',
+                  { items: [item] }
+                )"
+              >
+                <v-icon>mdi-close</v-icon>
               </v-btn>
             </template>
           </dir-item>
@@ -226,16 +224,15 @@ Copyright © 2021 - present Aleksey Hoffman. All rights reserved.
             }"
           >
             <template #actions>
-              <v-btn icon>
-                <v-icon
-                  @dblclick.prevent.stop=""
-                  @click.prevent.stop="$store.dispatch(
-                    'REMOVE_FROM_PROTECTED',
-                    { items: [item] }
-                  )"
-                >
-                  mdi-close
-                </v-icon>
+              <v-btn
+                icon
+                @dblclick.prevent.stop=""
+                @click.prevent.stop="$store.dispatch(
+                  'REMOVE_FROM_PROTECTED',
+                  { items: [item] }
+                )"
+              >
+                <v-icon>mdi-close</v-icon>
               </v-btn>
             </template>
           </dir-item>
@@ -258,16 +255,15 @@ Copyright © 2021 - present Aleksey Hoffman. All rights reserved.
             }"
           >
             <template #actions>
-              <v-btn icon>
-                <v-icon
-                  @dblclick.prevent.stop=""
-                  @click.prevent.stop="$store.dispatch(
-                    'REMOVE_FROM_PROTECTED',
-                    { items: [item] }
-                  )"
-                >
-                  mdi-close
-                </v-icon>
+              <v-btn
+                icon
+                @dblclick.prevent.stop=""
+                @click.prevent.stop="$store.dispatch(
+                  'REMOVE_FROM_PROTECTED',
+                  { items: [item] }
+                )"
+              >
+                <v-icon>mdi-close</v-icon>
               </v-btn>
             </template>
           </dir-item>
@@ -353,16 +349,15 @@ Copyright © 2021 - present Aleksey Hoffman. All rights reserved.
               }"
             >
               <template #actions>
-                <v-btn icon>
-                  <v-icon
-                    @dblclick.prevent.stop=""
-                    @click.prevent.stop="$store.dispatch(
-                      'REMOVE_FROM_DIR_ITEMS_TIMELINE',
-                      {items: [item]}
-                    )"
-                  >
-                    mdi-close
-                  </v-icon>
+                <v-btn
+                  icon
+                  @dblclick.prevent.stop=""
+                  @click.prevent.stop="$store.dispatch(
+                    'REMOVE_FROM_DIR_ITEMS_TIMELINE',
+                    {items: [item]}
+                  )"
+                >
+                  <v-icon>mdi-close</v-icon>
                 </v-btn>
               </template>
             </dir-item>