fix: drag handle

jledentu · Aug 22, 2022 · db1f740 · db1f740
1 parent f26c98f
commit db1f740
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 9 deletions.
diff --git a/.storybook/main.js b/.storybook/main.js
@@ -17,8 +17,6 @@ module.exports = {
       path.resolve(__dirname, "../vite.config.js")
     );
 
-    console.log(JSON.stringify(config));
-
     return {
       ...config,
       define: {

diff --git a/src/components/FinderItem.vue b/src/components/FinderItem.vue
@@ -6,7 +6,7 @@
       node.cssClass || '',
       {
         expanded,
-        draggable: dragEnabled && (!options.hasDragHandle || dragHandleOver),
+        draggable: dragEnabled && !options.hasDragHandle,
         dragged,
         'has-drag-handle': dragEnabled && options.hasDragHandle,
         'drag-over': dragOver,
@@ -29,7 +29,7 @@
       ...(dragOver &&
         theme.dropZoneBgColor && { backgroundColor: theme.dropZoneBgColor }),
     }"
-    :draggable="dragEnabled && !options.hasDragHandle"
+    :draggable="dragEnabled && (!options.hasDragHandle || dragHandleOver)"
     :aria-expanded="node.isLeaf ? undefined : expanded"
     v-bind="$attrs"
     @mousedown="onMouseDown"
@@ -207,9 +207,7 @@ export default {
         return;
       }
 
-      if (this.options.hasDragHandle) {
-        this.$el.setAttribute("draggable", "false");
-      }
+      this.dragHandleOver = false;
 
       this.treeModel.stopDrag();
     },

diff --git a/src/components/__tests__/FinderItem.test.js b/src/components/__tests__/FinderItem.test.js
@@ -430,10 +430,10 @@ describe("FinderItem", () => {
         });
 
         await wrapper.find(".drag-handle").trigger("mousedown");
-        expect(wrapper.find(".item").classes()).toContain("draggable");
+        expect(wrapper.find(".item").attributes("draggable")).toBe("true");
 
         await wrapper.find(".drag-handle").trigger("mouseup");
-        expect(wrapper.find(".item").classes()).not.toContain("draggable");
+        expect(wrapper.find(".item").attributes("draggable")).toBe("false");
       });
 
       it("should remove ghost element if 'dragImageComponent' is defined", async () => {