Using event pull mode to determine if the element is cloning on remove

Author: David-Desmaisons

src/vuedraggable.js

@@ -54,17 +54,6 @@ function delegateAndEmit(evtName) {
   };
 }
 
-function groupIsClone(group) {
-  if (!group) {
-    return false;
-  }
-  const { pull } = group;
-  if (typeof pull === "function") {
-    return pull() === "clone";
-  }
-  return pull === "clone";
-}
-
 const eventsListened = ["Start", "Add", "Remove", "Update", "End"];
 const eventsToEmit = ["Choose", "Sort", "Filter", "Clone"];
 const readonlyProperties = ["Move", ...eventsListened, ...eventsToEmit].map(
@@ -125,7 +114,6 @@ const draggableComponent = {
       transitionMode: false,
       noneFunctionalComponentMode: false,
       init: false,
-      isCloning: false
     };
   },
 
@@ -268,12 +256,6 @@ const draggableComponent = {
       return this.tag || this.element;
     },
 
-    getIsCloning() {
-      const { group } = this.$attrs;
-      const groupConsideringOption = group || this.getOptionGroup();
-      return groupIsClone(groupConsideringOption);
-    },
-
     getOptionGroup() {
       const { options } = this;
       if (!options) {
@@ -404,7 +386,6 @@ const draggableComponent = {
 
     onDragStart(evt) {
       this.context = this.getUnderlyingVm(evt.item);
-      this.isCloning = this.getIsCloning();
       evt.item._underlying_vm_ = this.clone(this.context.element);
       draggingElement = evt.item;
     },
@@ -423,8 +404,8 @@ const draggableComponent = {
     },
 
     onDragRemove(evt) {
-      insertNodeAt(this.rootContainer, evt.item, evt.oldIndex);
-      if (this.isCloning) {
+      insertNodeAt(this.rootContainer, evt.item, evt.oldIndex);    
+      if ( evt.pullMode === "clone") {
         removeNode(evt.clone);
         return;
       }

tests/unit/vuedraggable.spec.js

@@ -371,10 +371,6 @@ describe("draggable.vue when initialized with list", () => {
       start(evt);
     });
 
-    it("sets the isCloning flag", () => {
-      expect(vm.isCloning).toBe(false);
-    })
-
     it("sends a start event", async () => {
       await Vue.nextTick();
       expect(wrapper.emitted()).toEqual({
@@ -602,9 +598,6 @@ describe("draggable.vue when initialized with list", () => {
         propsData: {
           list: items
         },
-        attrs: {
-          group: { pull: "clone" }
-        },
         slots: {
           default: items.map(item => `<div>${item}</div>`),
         }
@@ -617,10 +610,6 @@ describe("draggable.vue when initialized with list", () => {
       start(evt);
     });
 
-    it("sets the isCloning flag", () => {
-      expect(vm.isCloning).toBe(true);
-    })
-
     describe("when remove is called", () => {
       beforeEach(() => {
         var clone = item.cloneNode(true);
@@ -630,6 +619,7 @@ describe("draggable.vue when initialized with list", () => {
         remove({
           item,
           clone,
+          pullMode: "clone",
           oldIndex: 1
         });
       })
@@ -649,6 +639,7 @@ describe("draggable.vue when initialized with list", () => {
         expect(wrapper.emitted().remove).toEqual([[{
           item,
           clone: item,
+          pullMode: "clone",
           oldIndex: 1
         }]]);
       })
@@ -684,10 +675,6 @@ describe("draggable.vue when initialized with list", () => {
       start(evt);
     });
 
-    it("sets the isCloning flag", () => {
-      expect(vm.isCloning).toBe(true);
-    })
-
     describe("when remove is called", () => {
       beforeEach(() => {
         var clone = item.cloneNode(true);
@@ -697,6 +684,7 @@ describe("draggable.vue when initialized with list", () => {
         remove({
           item,
           clone,
+          pullMode: "clone",
           oldIndex: 1
         });
       })
@@ -716,6 +704,7 @@ describe("draggable.vue when initialized with list", () => {
         expect(wrapper.emitted().remove).toEqual([[{
           item,
           clone: item,
+          pullMode: "clone",
           oldIndex: 1
         }]]);
       })