jqtree 1.8.10 → 1.8.11

package/bower.json

@@ -1,18 +1,11 @@
 {
     "name": "jqTree",
-    "version": "1.8.10",
-    "main": [
-        "jqtree.css",
-        "jqtree-circle.png",
-        "tree.jquery.js"
-    ],
+    "version": "1.8.11",
+    "main": ["jqtree.css", "jqtree-circle.png", "tree.jquery.js"],
     "dependencies": {
         "jquery": ">=1.9"
     },
     "license": "Apache-2.0",
     "ignore": [],
-    "keywords": [
-        "jquery-plugin",
-        "tree"
-    ]
+    "keywords": ["jquery-plugin", "tree"]
 }

package/eslint.config.mjs

@@ -1,11 +1,13 @@
+import cspellESLintPluginRecommended from "@cspell/eslint-plugin/recommended";
 import eslint from "@eslint/js";
 import tseslint from "typescript-eslint";
 import importPlugin from "eslint-plugin-import";
-import jestPlugin from "eslint-plugin-jest";
 import jestDomPlugin from "eslint-plugin-jest-dom";
+import jestExtendedPlugin from "eslint-plugin-jest-extended";
 import perfectionistPlugin from "eslint-plugin-perfectionist";
 import playwrightPlugin from "eslint-plugin-playwright";
 import testingLibraryPlugin from "eslint-plugin-testing-library";
+import vitestPlugin from "@vitest/eslint-plugin";
 
 export default [
     eslint.configs.recommended,
@@ -14,6 +16,7 @@ export default [
     importPlugin.flatConfigs.recommended,
     importPlugin.flatConfigs.typescript,
     perfectionistPlugin.configs["recommended-natural"],
+    cspellESLintPluginRecommended,
     {
         languageOptions: {
             parserOptions: {
@@ -24,6 +27,7 @@ export default [
         rules: {
             "@typescript-eslint/explicit-function-return-type": "off",
             "@typescript-eslint/interface-name-prefix": "off",
+            "@typescript-eslint/no-empty-object-type": "off",
             "@typescript-eslint/no-explicit-any": "off",
             "@typescript-eslint/no-use-before-define": "off",
             "@typescript-eslint/no-unused-vars": [
@@ -47,16 +51,32 @@ export default [
                 },
             ],
             "@typescript-eslint/unified-signatures": "off",
+            "@cspell/spellchecker": [
+                "error",
+                {
+                    configFile: "./config/cspell.json",
+                },
+            ],
         },
     },
     {
         files: ["src/test/**/*.ts"],
-        ...jestPlugin.configs["flat/recommended"],
+        ...vitestPlugin.configs.all,
     },
     {
         files: ["src/test/**/*.ts"],
         rules: {
-            "jest/no-identical-title": "off",
+            "vitest/no-duplicate-hooks": "off",
+            "vitest/no-hooks": "off",
+            "vitest/no-identical-title": "off",
+            "vitest/prefer-called-times": "off",
+            "vitest/prefer-describe-function-title": "off",
+            "vitest/prefer-expect-assertions": "off",
+            "vitest/prefer-importing-vitest-globals": "off",
+            "vitest/prefer-lowercase-title": "off",
+            "vitest/prefer-strict-boolean-matchers": "off",
+            "vitest/require-hook": "off",
+            "vitest/require-mock-type-parameters": "off",
         },
     },
     {
@@ -67,6 +87,10 @@ export default [
         files: ["src/test/**/*.ts"],
         ...jestDomPlugin.configs["flat/recommended"],
     },
+    {
+        files: ["src/test/**/*.ts"],
+        ...jestExtendedPlugin.configs["flat/all"],
+    },
     {
         files: ["src/playwright/**/*.ts"],
         ...playwrightPlugin.configs["flat/recommended"],

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "jqtree",
-    "version": "1.8.10",
+    "version": "1.8.11",
     "description": "Tree widget for jQuery",
     "keywords": [
         "jquery-plugin",
@@ -16,8 +16,8 @@
     },
     "scripts": {
         "ci": "pnpm lint && pnpm tsc && pnpm test",
-        "jest": "jest --coverage --no-cache --verbose --config ./config/jest.config.js",
-        "jest-watch": "jest --watch --config ./config/jest.config.js",
+        "vitest": "vitest run --coverage --config config/vitest.config.ts",
+        "vitest-watch": "vitest --config config/vitest.config.ts",
         "lint": "eslint src",
         "production": "./config/production",
         "devserver": "SERVE=true rollup --config config/rollup.config.mjs --watch",
@@ -26,61 +26,64 @@
         "prettier": "prettier src/*.ts --write --tab-width 4",
         "tsc": "tsc --noEmit --project tsconfig.json",
         "playwright": "pnpm build-with-coverage && playwright test --config config/playwright.config.js",
-        "test": "pnpm jest && pnpm playwright"
+        "test": "pnpm vitest && pnpm playwright"
     },
-    "browserslist": [
-        "defaults"
-    ],
     "peerDependencies": {
-        "jquery": "^3"
+        "jquery": ">= 3"
     },
     "devDependencies": {
-        "@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.49.1",
-        "@rollup/plugin-babel": "^6.0.4",
-        "@rollup/plugin-node-resolve": "^16.0.0",
+        "@babel/cli": "^7.28.6",
+        "@babel/core": "^7.28.6",
+        "@babel/preset-env": "^7.28.6",
+        "@babel/preset-typescript": "^7.28.5",
+        "@cspell/eslint-plugin": "^9.6.0",
+        "@eslint/js": "^9.39.2",
+        "@playwright/test": "^1.57.0",
+        "@rollup/plugin-babel": "^6.1.0",
+        "@rollup/plugin-node-resolve": "^16.0.3",
         "@rollup/plugin-terser": "^0.4.4",
-        "@testing-library/dom": "^10.4.0",
-        "@testing-library/jest-dom": "^6.6.3",
-        "@testing-library/user-event": "^14.5.2",
+        "@testing-library/dom": "^10.4.1",
+        "@testing-library/jest-dom": "^6.9.1",
+        "@testing-library/user-event": "^14.6.1",
         "@types/debug": "^4.1.12",
-        "@types/jest": "^29.5.14",
-        "@types/jest-axe": "^3.5.9",
-        "@types/jquery": "^3.5.32",
-        "@types/node": "^22.10.2",
-        "autoprefixer": "^10.4.20",
-        "babel-jest": "^29.7.0",
-        "babel-plugin-istanbul": "^7.0.0",
-        "eslint": "^9.17.0",
-        "eslint-plugin-import": "^2.31.0",
-        "eslint-plugin-jest": "^28.10.0",
+        "@types/jquery": "^3.5.33",
+        "@types/node": "^25.0.10",
+        "@vitest/coverage-istanbul": "^4.0.18",
+        "@vitest/eslint-plugin": "^1.6.6",
+        "autoprefixer": "^10.4.23",
+        "axe-core": "^4.11.1",
+        "babel-plugin-istanbul": "^7.0.1",
+        "eslint": "^9.39.2",
+        "eslint-plugin-import": "^2.32.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",
+        "eslint-plugin-jest-extended": "^3.0.1",
+        "eslint-plugin-perfectionist": "^5.4.0",
+        "eslint-plugin-playwright": "^2.5.0",
+        "eslint-plugin-testing-library": "^7.15.4",
         "givens": "^1.3.9",
-        "graphql": "^16.10.0",
-        "jest": "^29.7.0",
-        "jest-axe": "^9.0.0",
-        "jest-extended": "^4.0.2",
-        "jest-fixed-jsdom": "^0.0.9",
-        "jsdom-testing-mocks": "^1.13.1",
-        "jsonfile": "^6.1.0",
-        "lodash": "^4.17.21",
-        "msw": "^2.7.0",
-        "postcss": "^8.4.49",
-        "postcss-cli": "^11.0.0",
-        "postcss-import": "^16.1.0",
+        "jest-extended": "^7.0.0",
+        "jsdom-testing-mocks": "^1.16.0",
+        "jsonfile": "^6.2.0",
+        "lodash": "^4.17.23",
+        "msw": "^2.12.7",
+        "postcss": "^8.5.6",
+        "postcss-cli": "^11.0.1",
+        "postcss-import": "^16.1.1",
         "postcss-load-config": "^6.0.1",
         "postcss-nested": "^7.0.2",
-        "prettier": "^3.4.2",
-        "rollup": "^4.29.1",
+        "prettier": "^3.8.1",
+        "rollup": "^4.56.0",
         "rollup-plugin-serve": "^3.0.0",
         "tslib": "^2.8.1",
-        "typescript": "^5.7.2",
-        "typescript-eslint": "^8.18.1"
+        "typescript": "^5.9.3",
+        "typescript-eslint": "^8.53.1",
+        "vitest": "^4.0.18"
+    },
+    "pnpm": {
+        "onlyBuiltDependencies": [
+            "esbuild",
+            "msw",
+            "unrs-resolver"
+        ]
     }
 }

package/src/elementsRenderer.ts

@@ -198,7 +198,7 @@ export default class ElementsRenderer {
      * Call onCreateLi
      */
     private createLi(node: Node, level: number): HTMLLIElement {
-        const isSelected = Boolean(this.isNodeSelected(node));
+        const isSelected = this.isNodeSelected(node);
 
         const mustShowFolder =
             node.isFolder() || (node.isEmptyFolder && this.showEmptyFolder);

package/src/mouseHandler.ts

@@ -6,22 +6,25 @@ import {
 } from "./mouseUtils";
 import { Node } from "./node";
 
+export type GetMouseDelay = () => number;
+export type GetNode = (element: HTMLElement) => Node | null;
+export type MouseCapture = (positionInfo: PositionInfo) => boolean | null;
+export type MouseStart = (positionInfo: PositionInfo) => boolean;
+
 interface ClickTarget {
     node: Node;
     type: "button" | "label";
 }
 
-type GetNode = (element: HTMLElement) => Node | null;
-
 interface MouseHandlerParams {
     element: HTMLElement;
     getMouseDelay: () => number;
     getNode: GetNode;
     onClickButton: (node: Node) => void;
     onClickTitle: (node: Node) => void;
-    onMouseCapture: (positionInfo: PositionInfo) => boolean | null;
+    onMouseCapture: MouseCapture;
     onMouseDrag: (positionInfo: PositionInfo) => void;
-    onMouseStart: (positionInfo: PositionInfo) => boolean;
+    onMouseStart: MouseStart;
     onMouseStop: (positionInfo: PositionInfo) => void;
     triggerEvent: TriggerEvent;
     useContextMenu: boolean;
@@ -29,7 +32,7 @@ interface MouseHandlerParams {
 
 class MouseHandler {
     private element: HTMLElement;
-    private getMouseDelay: () => number;
+    private getMouseDelay: GetMouseDelay;
     private getNode: GetNode;
 
     private isMouseDelayMet: boolean;
@@ -42,11 +45,11 @@ class MouseHandler {
     private onClickButton: (node: Node) => void;
     private onClickTitle: (node: Node) => void;
 
-    private onMouseCapture: (positionInfo: PositionInfo) => boolean | null;
+    private onMouseCapture: MouseCapture;
 
     private onMouseDrag: (positionInfo: PositionInfo) => void;
 
-    private onMouseStart: (positionInfo: PositionInfo) => boolean;
+    private onMouseStart: MouseStart;
 
     private onMouseStop: (positionInfo: PositionInfo) => void;
 

package/src/node.ts

@@ -202,11 +202,7 @@ export class Node implements INode {
         if (!this.hasChildren()) {
             return null;
         } else {
-            const lastChild = this.children[this.children.length - 1];
-
-            if (!lastChild) {
-                return null;
-            }
+            const lastChild = this.children[this.children.length - 1] as Node;
 
             if (!(lastChild.hasChildren() && lastChild.is_open)) {
                 return lastChild;

package/src/nodeElement/index.ts

@@ -52,9 +52,7 @@ class NodeElement {
     public init(node: Node): void {
         this.node = node;
 
-        if (!node.element) {
-            node.element = this.treeElement;
-        }
+        node.element ??= this.treeElement;
 
         this.element = node.element;
     }

package/src/scrollHandler/containerScrollParent.ts

@@ -1,92 +1,28 @@
-import type { ScrollParent } from "./types";
-
-import { getElementPosition, getOffsetTop } from '../util'
-
-type HorizontalScrollDirection = "left" | "right";
-interface Params {
-    container: HTMLElement;
-    refreshHitAreas: () => void;
-}
-
-type VerticalScrollDirection = "bottom" | "top";
-
-export default class ContainerScrollParent implements ScrollParent {
-    private container: HTMLElement;
-    private horizontalScrollDirection?: HorizontalScrollDirection;
-    private horizontalScrollTimeout?: number;
-    private refreshHitAreas: () => void;
+import { getElementPosition, getOffsetTop } from "../util";
+import {
+    HorizontalScrollDirection,
+    ScrollParent,
+    VerticalScrollDirection,
+} from "./scrollParent";
+
+export default class ContainerScrollParent extends ScrollParent {
     private scrollParentBottom?: number;
     private scrollParentTop?: number;
-    private verticalScrollDirection?: VerticalScrollDirection;
-    private verticalScrollTimeout?: number;
-
-    constructor({ container, refreshHitAreas }: Params) {
-        this.container = container;
-        this.refreshHitAreas = refreshHitAreas;
-    }
-
-    public checkHorizontalScrolling(pageX: number): void {
-        const newHorizontalScrollDirection =
-            this.getNewHorizontalScrollDirection(pageX);
-
-        if (this.horizontalScrollDirection !== newHorizontalScrollDirection) {
-            this.horizontalScrollDirection = newHorizontalScrollDirection;
-
-            if (this.horizontalScrollTimeout != null) {
-                window.clearTimeout(this.verticalScrollTimeout);
-            }
-
-            if (newHorizontalScrollDirection) {
-                this.horizontalScrollTimeout = window.setTimeout(
-                    this.scrollHorizontally.bind(this),
-                    40,
-                );
-            }
-        }
-    }
-
-    public checkVerticalScrolling(pageY: number) {
-        const newVerticalScrollDirection =
-            this.getNewVerticalScrollDirection(pageY);
-
-        if (this.verticalScrollDirection !== newVerticalScrollDirection) {
-            this.verticalScrollDirection = newVerticalScrollDirection;
-
-            if (this.verticalScrollTimeout != null) {
-                window.clearTimeout(this.verticalScrollTimeout);
-                this.verticalScrollTimeout = undefined;
-            }
-
-            if (newVerticalScrollDirection) {
-                this.verticalScrollTimeout = window.setTimeout(
-                    this.scrollVertically.bind(this),
-                    40,
-                );
-            }
-        }
-    }
-
-    public getScrollLeft(): number {
-        return this.container.scrollLeft;
-    }
-
-    public scrollToY(top: number): void {
-        this.container.scrollTop = top;
-    }
 
     public stopScrolling() {
+        super.stopScrolling();
+
         this.horizontalScrollDirection = undefined;
         this.verticalScrollDirection = undefined;
-        this.scrollParentTop = undefined;
-        this.scrollParentBottom = undefined;
     }
 
-    private getNewHorizontalScrollDirection(
+    protected getNewHorizontalScrollDirection(
         pageX: number,
     ): HorizontalScrollDirection | undefined {
         const scrollParentOffset = getElementPosition(this.container);
+        const containerWidth = this.container.getBoundingClientRect().width;
 
-        const rightEdge = scrollParentOffset.left + this.container.clientWidth;
+        const rightEdge = scrollParentOffset.left + containerWidth;
         const leftEdge = scrollParentOffset.left;
         const isNearRightEdge = pageX > rightEdge - 20;
         const isNearLeftEdge = pageX < leftEdge + 20;
@@ -100,7 +36,7 @@ export default class ContainerScrollParent implements ScrollParent {
         return undefined;
     }
 
-    private getNewVerticalScrollDirection(
+    protected getNewVerticalScrollDirection(
         pageY: number,
     ): undefined | VerticalScrollDirection {
         if (pageY < this.getScrollParentTop()) {
@@ -116,53 +52,18 @@ export default class ContainerScrollParent implements ScrollParent {
 
     private getScrollParentBottom() {
         if (this.scrollParentBottom == null) {
-            this.scrollParentBottom = this.getScrollParentTop() + this.container.clientHeight;
+            const containerHeight =
+                this.container.getBoundingClientRect().height;
+            this.scrollParentBottom =
+                this.getScrollParentTop() + containerHeight;
         }
 
         return this.scrollParentBottom;
     }
 
     private getScrollParentTop() {
-        if (this.scrollParentTop == null) {
-            this.scrollParentTop = getOffsetTop(this.container)
-        }
+        this.scrollParentTop ??= getOffsetTop(this.container);
 
         return this.scrollParentTop;
     }
-
-    private scrollHorizontally() {
-        if (!this.horizontalScrollDirection) {
-            return;
-        }
-
-        const distance = this.horizontalScrollDirection === "left" ? -20 : 20;
-
-        this.container.scrollBy({
-            behavior: "instant",
-            left: distance,
-            top: 0,
-        });
-
-        this.refreshHitAreas();
-
-        setTimeout(this.scrollHorizontally.bind(this), 40);
-    }
-
-    private scrollVertically() {
-        if (!this.verticalScrollDirection) {
-            return;
-        }
-
-        const distance = this.verticalScrollDirection === "top" ? -20 : 20;
-
-        this.container.scrollBy({
-            behavior: "instant",
-            left: 0,
-            top: distance,
-        });
-
-        this.refreshHitAreas();
-
-        setTimeout(this.scrollVertically.bind(this), 40);
-    }
 }

package/src/scrollHandler/createScrollParent.ts

@@ -1,4 +1,4 @@
-import type { ScrollParent } from "./types";
+import type { ScrollParent } from "./scrollParent";
 
 import ContainerScrollParent from "./containerScrollParent";
 import DocumentScrollParent from "./documentScrollParent";