svelte-dnd-action 0.9.46 → 0.9.48

package/README.md

@@ -251,7 +251,8 @@ Notes:
 
 -   [Copy on drag, simple and Dragula like](https://svelte.dev/repl/924b4cc920524065a637fa910fe10193?version=3)
 -   [Copy on drop and a drop area with a single slot](https://svelte.dev/repl/b4e120c45c3e48e49a0d637f0cf097d9?version=3)
--   [Drag handles](https://svelte.dev/repl/4949485c5a8f46e7bdbeb73ed565a9c7?version=3), legacy - before version 0.9.46, courtesy of @gleuch
+-   [Drag handles using wrapper actions](https://svelte.dev/repl/cc1bc63be7a74830b4c97d428f62054d?version=4.2.17), for nested scenarios (same usage, it "just works"), see [here](https://svelte.dev/repl/4f7cbeb7b11b470b948e9af03b82a073?version=4.2.17) and [here](https://svelte.dev/repl/47c5f52f4c774cad8c367516395c7f99?version=4.2.17)
+-   [Drag handles - legacy](https://svelte.dev/repl/4949485c5a8f46e7bdbeb73ed565a9c7?version=3), use before version 0.9.46, courtesy of @gleuch
 -   [Interaction (save/get items) with an asynchronous server](https://svelte.dev/repl/964fdac31cb9496da9ded35002300abb?version=3)
 -   [Unsortable lists with custom aria instructions](https://svelte.dev/repl/e020ea1051dc4ae3ac2b697064f234bc?version=3)
 -   [Crazy nesting](https://svelte.dev/repl/fe8c9eca04f9417a94a8b6041df77139?version=3), courtesy of @zahachtah

package/dist/index.js

@@ -807,11 +807,11 @@
         return false;
       }
       var distances = calcInnerDistancesBetweenPointAndSidesOfElement(pointer, elementToScroll);
+      var isAlreadyScrolling = !!scrollingInfo.directionObj;
       if (distances === null) {
-        resetScrolling();
+        if (isAlreadyScrolling) resetScrolling();
         return false;
       }
-      var isAlreadyScrolling = !!scrollingInfo.directionObj;
       var scrollingVertically = false,
         scrollingHorizontally = false;
       // vertical
@@ -912,7 +912,8 @@
       return getDepth(dz2) - getDepth(dz1);
     });
     var _makeScroller = makeScroller(),
-      scrollIfNeeded = _makeScroller.scrollIfNeeded;
+      scrollIfNeeded = _makeScroller.scrollIfNeeded,
+      resetScrolling = _makeScroller.resetScrolling;
 
     /**
      * @return {boolean} - was any container scrolled
@@ -936,6 +937,9 @@
     return {
       multiScrollIfNeeded: scrollingContainersSet.size > 0 ? tick : function () {
         return false;
+      },
+      destroy: function destroy() {
+        return resetScrolling();
       }
     };
   }
@@ -1294,6 +1298,7 @@
   var unlockOriginDzMinDimensions;
   var isDraggedOutsideOfAnyDz = false;
   var scheduledForRemovalAfterDrop = [];
+  var multiScroller;
 
   // a map from type to a set of drop-zones
   var typeToDropZones = new Map();
@@ -1350,7 +1355,7 @@
       return dzToConfig.get(dz).dropAnimationDurationMs;
     })));
     var observationIntervalMs = setIntervalMs === 0 ? DISABLED_OBSERVATION_INTERVAL_MS : Math.max(setIntervalMs, MIN_OBSERVATION_INTERVAL_MS); // if setIntervalMs is 0 it goes to 20, otherwise it is max between it and min observation.
-    var multiScroller = createMultiScroller(dropZones, function () {
+    multiScroller = createMultiScroller(dropZones, function () {
       return currentMousePosition;
     });
     observe(draggedEl, dropZones, observationIntervalMs * 1.07, multiScroller);
@@ -1375,6 +1380,8 @@
       _iterator2.f();
     }
     window.removeEventListener(DRAGGED_LEFT_DOCUMENT_EVENT_NAME, handleDrop);
+    multiScroller.destroy();
+    multiScroller = undefined;
     unobserve();
   }
   function findShadowElementIdx(items) {

package/dist/index.mjs

@@ -801,11 +801,11 @@ function makeScroller() {
       return false;
     }
     var distances = calcInnerDistancesBetweenPointAndSidesOfElement(pointer, elementToScroll);
+    var isAlreadyScrolling = !!scrollingInfo.directionObj;
     if (distances === null) {
-      resetScrolling();
+      if (isAlreadyScrolling) resetScrolling();
       return false;
     }
-    var isAlreadyScrolling = !!scrollingInfo.directionObj;
     var scrollingVertically = false,
       scrollingHorizontally = false;
     // vertical
@@ -906,7 +906,8 @@ function createMultiScroller() {
     return getDepth(dz2) - getDepth(dz1);
   });
   var _makeScroller = makeScroller(),
-    scrollIfNeeded = _makeScroller.scrollIfNeeded;
+    scrollIfNeeded = _makeScroller.scrollIfNeeded,
+    resetScrolling = _makeScroller.resetScrolling;
 
   /**
    * @return {boolean} - was any container scrolled
@@ -930,6 +931,9 @@ function createMultiScroller() {
   return {
     multiScrollIfNeeded: scrollingContainersSet.size > 0 ? tick : function () {
       return false;
+    },
+    destroy: function destroy() {
+      return resetScrolling();
     }
   };
 }
@@ -1288,6 +1292,7 @@ var finalizingPreviousDrag = false;
 var unlockOriginDzMinDimensions;
 var isDraggedOutsideOfAnyDz = false;
 var scheduledForRemovalAfterDrop = [];
+var multiScroller;
 
 // a map from type to a set of drop-zones
 var typeToDropZones = new Map();
@@ -1344,7 +1349,7 @@ function watchDraggedElement() {
     return dzToConfig.get(dz).dropAnimationDurationMs;
   })));
   var observationIntervalMs = setIntervalMs === 0 ? DISABLED_OBSERVATION_INTERVAL_MS : Math.max(setIntervalMs, MIN_OBSERVATION_INTERVAL_MS); // if setIntervalMs is 0 it goes to 20, otherwise it is max between it and min observation.
-  var multiScroller = createMultiScroller(dropZones, function () {
+  multiScroller = createMultiScroller(dropZones, function () {
     return currentMousePosition;
   });
   observe(draggedEl, dropZones, observationIntervalMs * 1.07, multiScroller);
@@ -1369,6 +1374,8 @@ function unWatchDraggedElement() {
     _iterator2.f();
   }
   window.removeEventListener(DRAGGED_LEFT_DOCUMENT_EVENT_NAME, handleDrop);
+  multiScroller.destroy();
+  multiScroller = undefined;
   unobserve();
 }
 function findShadowElementIdx(items) {

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "svelte-dnd-action",
     "description": "*An awesome drag and drop library for Svelte 3 and 4 (not using the browser's built-in dnd, thanks god): Rich animations, nested containers, touch support and more *",
-    "version": "0.9.46",
+    "version": "0.9.48",
     "repository": {
         "type": "git",
         "url": "git+https://github.com/isaacHagoel/svelte-dnd-action.git"

package/src/helpers/multiScroller.js

@@ -16,7 +16,7 @@ export function createMultiScroller(baseElementsForScrolling = [], getPointerPos
     printDebug(() => "creating multi-scroller");
     const scrollingContainersSet = findRelevantScrollContainers(baseElementsForScrolling);
     const scrollingContainersDeepToShallow = Array.from(scrollingContainersSet).sort((dz1, dz2) => getDepth(dz2) - getDepth(dz1));
-    const {scrollIfNeeded} = makeScroller();
+    const {scrollIfNeeded, resetScrolling} = makeScroller();
 
     /**
      * @return {boolean} - was any container scrolled
@@ -38,7 +38,8 @@ export function createMultiScroller(baseElementsForScrolling = [], getPointerPos
         return false;
     }
     return {
-        multiScrollIfNeeded: scrollingContainersSet.size > 0 ? tick : () => false
+        multiScrollIfNeeded: scrollingContainersSet.size > 0 ? tick : () => false,
+        destroy: () => resetScrolling()
     };
 }
 

package/src/helpers/scroller.js

@@ -35,11 +35,11 @@ export function makeScroller() {
             return false;
         }
         const distances = calcInnerDistancesBetweenPointAndSidesOfElement(pointer, elementToScroll);
+        const isAlreadyScrolling = !!scrollingInfo.directionObj;
         if (distances === null) {
-            resetScrolling();
+            if (isAlreadyScrolling) resetScrolling();
             return false;
         }
-        const isAlreadyScrolling = !!scrollingInfo.directionObj;
         let [scrollingVertically, scrollingHorizontally] = [false, false];
         // vertical
         if (elementToScroll.scrollHeight > elementToScroll.clientHeight) {

package/src/pointerAction.js

@@ -58,6 +58,7 @@ let finalizingPreviousDrag = false;
 let unlockOriginDzMinDimensions;
 let isDraggedOutsideOfAnyDz = false;
 let scheduledForRemovalAfterDrop = [];
+let multiScroller;
 
 // a map from type to a set of drop-zones
 const typeToDropZones = new Map();
@@ -100,7 +101,7 @@ function watchDraggedElement() {
     // it is important that we don't have an interval that is faster than the flip duration because it can cause elements to jump bach and forth
     const setIntervalMs = Math.max(...Array.from(dropZones.keys()).map(dz => dzToConfig.get(dz).dropAnimationDurationMs));
     const observationIntervalMs = setIntervalMs === 0 ? DISABLED_OBSERVATION_INTERVAL_MS : Math.max(setIntervalMs, MIN_OBSERVATION_INTERVAL_MS); // if setIntervalMs is 0 it goes to 20, otherwise it is max between it and min observation.
-    const multiScroller = createMultiScroller(dropZones, () => currentMousePosition);
+    multiScroller = createMultiScroller(dropZones, () => currentMousePosition);
     observe(draggedEl, dropZones, observationIntervalMs * 1.07, multiScroller);
 }
 function unWatchDraggedElement() {
@@ -112,6 +113,8 @@ function unWatchDraggedElement() {
         dz.removeEventListener(DRAGGED_OVER_INDEX_EVENT_NAME, handleDraggedIsOverIndex);
     }
     window.removeEventListener(DRAGGED_LEFT_DOCUMENT_EVENT_NAME, handleDrop);
+    multiScroller.destroy();
+    multiScroller = undefined;
     unobserve();
 }