jqtree 1.8.8 → 1.8.9

package/bower.json

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

package/eslint.config.mjs

@@ -5,6 +5,7 @@ import jestPlugin from "eslint-plugin-jest";
 import jestDomPlugin from "eslint-plugin-jest-dom";
 import perfectionistPlugin from "eslint-plugin-perfectionist";
 import playwrightPlugin from "eslint-plugin-playwright";
+import testingLibraryPlugin from "eslint-plugin-testing-library";
 
 export default [
     eslint.configs.recommended,
@@ -59,7 +60,11 @@ export default [
         },
     },
     {
-        files: ["src/test/jqTree/**/*.ts"],
+        files: ["src/test/**/*.ts"],
+        ...testingLibraryPlugin.configs["flat/dom"],
+    },
+    {
+        files: ["src/test/**/*.ts"],
         ...jestDomPlugin.configs["flat/recommended"],
     },
     {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "jqtree",
-    "version": "1.8.8",
+    "version": "1.8.9",
     "description": "Tree widget for jQuery",
     "keywords": [
         "jquery-plugin",
@@ -35,13 +35,13 @@
         "jquery": "^3"
     },
     "devDependencies": {
-        "@babel/cli": "^7.25.9",
+        "@babel/cli": "^7.26.4",
         "@babel/core": "^7.26.0",
         "@babel/preset-env": "^7.26.0",
         "@babel/preset-typescript": "^7.26.0",
-        "@playwright/test": "^1.48.2",
+        "@playwright/test": "^1.49.1",
         "@rollup/plugin-babel": "^6.0.4",
-        "@rollup/plugin-node-resolve": "^15.3.0",
+        "@rollup/plugin-node-resolve": "^16.0.0",
         "@rollup/plugin-terser": "^0.4.4",
         "@testing-library/dom": "^10.4.0",
         "@testing-library/jest-dom": "^6.6.3",
@@ -50,35 +50,37 @@
         "@types/jest": "^29.5.14",
         "@types/jest-axe": "^3.5.9",
         "@types/jquery": "^3.5.32",
-        "@types/node": "^22.9.0",
+        "@types/node": "^22.10.2",
         "autoprefixer": "^10.4.20",
         "babel-jest": "^29.7.0",
         "babel-plugin-istanbul": "^7.0.0",
-        "eslint": "^9.14.0",
+        "eslint": "^9.17.0",
         "eslint-plugin-import": "^2.31.0",
-        "eslint-plugin-jest": "^28.9.0",
-        "eslint-plugin-jest-dom": "^5.4.0",
-        "eslint-plugin-perfectionist": "^3.9.1",
-        "eslint-plugin-playwright": "^2.0.1",
+        "eslint-plugin-jest": "^28.10.0",
+        "eslint-plugin-jest-dom": "^5.5.0",
+        "eslint-plugin-perfectionist": "^4.4.0",
+        "eslint-plugin-playwright": "^2.1.0",
+        "eslint-plugin-testing-library": "^7",
         "givens": "^1.3.9",
-        "graphql": "^16.9.0",
+        "graphql": "^16.10.0",
         "jest": "^29.7.0",
         "jest-axe": "^9.0.0",
         "jest-extended": "^4.0.2",
-        "jest-fixed-jsdom": "^0.0.8",
+        "jest-fixed-jsdom": "^0.0.9",
+        "jsdom-testing-mocks": "^1.13.1",
         "jsonfile": "^6.1.0",
         "lodash": "^4.17.21",
-        "msw": "^2.6.2",
-        "postcss": "^8.4.47",
+        "msw": "^2.7.0",
+        "postcss": "^8.4.49",
         "postcss-cli": "^11.0.0",
         "postcss-import": "^16.1.0",
         "postcss-load-config": "^6.0.1",
         "postcss-nested": "^7.0.2",
-        "prettier": "^3.3.3",
-        "rollup": "^4.24.4",
+        "prettier": "^3.4.2",
+        "rollup": "^4.29.1",
         "rollup-plugin-serve": "^3.0.0",
         "tslib": "^2.8.1",
-        "typescript": "^5.6.3",
-        "typescript-eslint": "^8.13.0"
+        "typescript": "^5.7.2",
+        "typescript-eslint": "^8.18.1"
     }
 }

package/src/dataLoader.ts

@@ -37,6 +37,44 @@ export default class DataLoader {
         this.triggerEvent = triggerEvent;
     }
 
+    public loadFromUrl(
+        urlInfo: JQuery.AjaxSettings | null | string,
+        parentNode: Node | null,
+        onFinished: HandleFinishedLoading | null,
+    ): void {
+        if (!urlInfo) {
+            return;
+        }
+
+        const element = this.getDomElement(parentNode);
+        this.addLoadingClass(element);
+        this.notifyLoading(true, parentNode, element);
+
+        const stopLoading = (): void => {
+            this.removeLoadingClass(element);
+            this.notifyLoading(false, parentNode, element);
+        };
+
+        const handleSuccess = (data: NodeData[] | string): void => {
+            stopLoading();
+            this.loadData(this.parseData(data), parentNode);
+
+            if (onFinished && typeof onFinished === "function") {
+                onFinished();
+            }
+        };
+
+        const handleError = (jqXHR: JQuery.jqXHR): void => {
+            stopLoading();
+
+            if (this.onLoadFailed) {
+                this.onLoadFailed(jqXHR);
+            }
+        };
+
+        this.submitRequest(urlInfo, handleSuccess, handleError);
+    }
+
     private addLoadingClass(element: HTMLElement): void {
         element.classList.add("jqtree-loading");
     }
@@ -112,42 +150,4 @@ export default class DataLoader {
 
         void jQuery.ajax(ajaxSettings);
     }
-
-    public loadFromUrl(
-        urlInfo: JQuery.AjaxSettings | null | string,
-        parentNode: Node | null,
-        onFinished: HandleFinishedLoading | null,
-    ): void {
-        if (!urlInfo) {
-            return;
-        }
-
-        const element = this.getDomElement(parentNode);
-        this.addLoadingClass(element);
-        this.notifyLoading(true, parentNode, element);
-
-        const stopLoading = (): void => {
-            this.removeLoadingClass(element);
-            this.notifyLoading(false, parentNode, element);
-        };
-
-        const handleSuccess = (data: NodeData[] | string): void => {
-            stopLoading();
-            this.loadData(this.parseData(data), parentNode);
-
-            if (onFinished && typeof onFinished === "function") {
-                onFinished();
-            }
-        };
-
-        const handleError = (jqXHR: JQuery.jqXHR): void => {
-            stopLoading();
-
-            if (this.onLoadFailed) {
-                this.onLoadFailed(jqXHR);
-            }
-        };
-
-        this.submitRequest(urlInfo, handleSuccess, handleError);
-    }
 }

package/src/dragAndDropHandler/binarySearch.ts

@@ -0,0 +1,27 @@
+function binarySearch<T>(items: T[], compareFn: (a: T) => number): null | T {
+    let low = 0;
+    let high = items.length;
+
+    while (low < high) {
+        const mid = (low + high) >> 1;
+        const item = items[mid];
+
+        if (item === undefined) {
+            return null;
+        }
+
+        const compareResult = compareFn(item);
+
+        if (compareResult > 0) {
+            high = mid;
+        } else if (compareResult < 0) {
+            low = mid + 1;
+        } else {
+            return item;
+        }
+    }
+
+    return null;
+}
+
+export default binarySearch;

package/src/dragAndDropHandler/dragElement.ts

@@ -26,6 +26,15 @@ class DragElement {
         treeElement.appendChild(this.element);
     }
 
+    public move(pageX: number, pageY: number): void {
+        this.element.style.left = `${pageX - this.offsetX}px`;
+        this.element.style.top = `${pageY - this.offsetY}px`;
+    }
+
+    public remove(): void {
+        this.element.remove();
+    }
+
     private createElement(nodeName: string, autoEscape: boolean) {
         const element = document.createElement("span");
         element.classList.add("jqtree-title", "jqtree-dragging");
@@ -40,15 +49,6 @@ class DragElement {
 
         return element;
     }
-
-    public move(pageX: number, pageY: number): void {
-        this.element.style.left = `${pageX - this.offsetX}px`;
-        this.element.style.top = `${pageY - this.offsetY}px`;
-    }
-
-    public remove(): void {
-        this.element.remove();
-    }
 }
 
 export default DragElement;

package/src/dragAndDropHandler/generateHitAreas.ts

@@ -1,12 +1,11 @@
-import { Node } from "../node";
-import { Position } from "../position";
+import { Node, Position } from "../node";
 import { getOffsetTop } from "../util";
 import iterateVisibleNodes from "./iterateVisibleNodes";
 import { HitArea } from "./types";
 
 interface HitPosition {
     node: Node;
-    position: Position;
+    position: null | Position;
     top: number;
 }
 
@@ -17,7 +16,11 @@ export const generateHitPositions = (
     const hitPositions: HitPosition[] = [];
     let lastTop = 0;
 
-    const addHitPosition = (node: Node, position: number, top: number) => {
+    const addHitPosition = (
+        node: Node,
+        position: null | Position,
+        top: number,
+    ) => {
         hitPositions.push({
             node,
             position,
@@ -29,9 +32,9 @@ export const generateHitPositions = (
     const handleAfterOpenFolder = (node: Node, nextNode: Node | null) => {
         if (node === currentNode || nextNode === currentNode) {
             // Cannot move before or after current item
-            addHitPosition(node, Position.None, lastTop);
+            addHitPosition(node, null, lastTop);
         } else {
-            addHitPosition(node, Position.After, lastTop);
+            addHitPosition(node, "after", lastTop);
         }
     };
 
@@ -44,20 +47,20 @@ export const generateHitPositions = (
 
         if (node === currentNode) {
             // Cannot move after current item
-            addHitPosition(node, Position.None, top);
+            addHitPosition(node, null, top);
         } else {
-            addHitPosition(node, Position.Inside, top);
+            addHitPosition(node, "inside", top);
 
             // Cannot move before current item
             if (nextNode !== currentNode) {
-                addHitPosition(node, Position.After, top);
+                addHitPosition(node, "after", top);
             }
         }
     };
 
     const handleFirstNode = (node: Node) => {
         if (node !== currentNode && node.element) {
-            addHitPosition(node, Position.Before, getOffsetTop(node.element));
+            addHitPosition(node, "before", getOffsetTop(node.element));
         }
     };
 
@@ -70,16 +73,16 @@ export const generateHitPositions = (
 
         if (node === currentNode) {
             // Cannot move inside current item
-            addHitPosition(node, Position.None, top);
+            addHitPosition(node, null, top);
         } else {
-            addHitPosition(node, Position.Inside, top);
+            addHitPosition(node, "inside", top);
         }
 
         if (nextNode === currentNode || node === currentNode) {
             // Cannot move before or after current item
-            addHitPosition(node, Position.None, top);
+            addHitPosition(node, null, top);
         } else {
-            addHitPosition(node, Position.After, top);
+            addHitPosition(node, "after", top);
         }
     };
 
@@ -90,11 +93,11 @@ export const generateHitPositions = (
             // 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;
-            addHitPosition(node, Position.None, top);
+            addHitPosition(node, null, top);
 
             if (height > 5) {
                 // Subtract 5 pixels to allow more space for the next element.
-                addHitPosition(node, Position.None, top + height - 5);
+                addHitPosition(node, null, top + height - 5);
             }
 
             // Stop iterating
@@ -103,7 +106,7 @@ export const generateHitPositions = (
 
         // Cannot move before current item
         if (node.children[0] !== currentNode) {
-            addHitPosition(node, Position.Inside, getOffsetTop(element));
+            addHitPosition(node, "inside", getOffsetTop(element));
         }
 
         // Continue iterating
@@ -136,7 +139,7 @@ export const generateHitAreasForGroup = (
     for (let i = 0; i < positionCount; i++) {
         const position = positionsInGroup[i] as HitPosition;
 
-        if (position.position !== Position.None) {
+        if (position.position) {
             hitAreas.push({
                 bottom: areaTop + areaHeight,
                 node: position.node,