jqtree 1.8.1 → 1.8.2

package/bower.json

@@ -1,6 +1,6 @@
 {
     "name": "jqTree",
-    "version": "1.8.1",
+    "version": "1.8.2",
     "main": [
         "jqtree.css",
         "jqtree-circle.png",

package/docs/_config.yml

@@ -118,7 +118,7 @@ defaults:
     values:
       layout: "example"
 
-jqtree_version: 1.8.1
+jqtree_version: 1.8.2
 
 # Build settings
 markdown: kramdown

package/docs/_entries/general/changelog.md

@@ -3,6 +3,10 @@ title: Changelog
 name: changelog
 ---
 
+#### 1.8.2 (march 24 2024)
+
+-   Issue #751: fix dnd regression (thanks to Tom De Ford)
+
 #### 1.8.1 (march 16 2024)
 
 -   Issue #791: fix onCanMoveTo (thanks to Christophe Caron)

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "jqtree",
-    "version": "1.8.1",
+    "version": "1.8.2",
     "description": "Tree widget for jQuery",
     "keywords": [
         "jquery-plugin",

package/src/dragAndDropHandler/generateHitAreas.ts

@@ -80,6 +80,17 @@ const generatePositions = (tree: Node, currentNode: Node): HitArea[] => {
     const handleOpenFolder = (node: Node, element: HTMLElement) => {
         if (node === currentNode) {
             // Cannot move inside current item
+
+            // Dnd over the current element is not possible: add a position with type None for the top and the bottom.
+            const top = getOffsetTop(element);
+            const height = element.clientHeight;
+            addPosition(node, Position.None, top);
+
+            if (height > 5) {
+                // Subtract 5 pixels to allow more space for the next element.
+                addPosition(node, Position.None, top + height - 5);
+            }
+
             // Stop iterating
             return false;
         }
@@ -120,7 +131,7 @@ const generateHitAreasForGroup = (
     while (i < positionCount) {
         const position = positionsInGroup[i];
 
-        if (position) {
+        if (position && position.position !== Position.None) {
             hitAreas.push({
                 top: areaTop,
                 bottom: areaTop + areaHeight,

package/src/version.ts

@@ -1,3 +1,3 @@
-const version = "1.8.1";
+const version = "1.8.2";
 
 export default version;

package/tree.jquery.debug.js

@@ -1,5 +1,5 @@
 /*
-JqTree 1.8.1
+JqTree 1.8.2
 
 Copyright 2024 Marco Braak
 
@@ -20,7 +20,7 @@ limitations under the License.
 var jqtree = (function (exports) {
     'use strict';
 
-    const version = "1.8.1";
+    const version = "1.8.2";
 
     let Position = /*#__PURE__*/function (Position) {
       Position[Position["Before"] = 1] = "Before";
@@ -204,6 +204,16 @@ var jqtree = (function (exports) {
       const handleOpenFolder = (node, element) => {
         if (node === currentNode) {
           // Cannot move inside current item
+
+          // Dnd over the current element is not possible: add a position with type None for the top and the bottom.
+          const top = getOffsetTop(element);
+          const height = element.clientHeight;
+          addPosition(node, Position.None, top);
+          if (height > 5) {
+            // Subtract 5 pixels to allow more space for the next element.
+            addPosition(node, Position.None, top + height - 5);
+          }
+
           // Stop iterating
           return false;
         }
@@ -233,7 +243,7 @@ var jqtree = (function (exports) {
       let i = 0;
       while (i < positionCount) {
         const position = positionsInGroup[i];
-        if (position) {
+        if (position && position.position !== Position.None) {
           hitAreas.push({
             top: areaTop,
             bottom: areaTop + areaHeight,