jqtree 1.7.0 → 1.7.2

package/src/saveStateHandler.ts

@@ -111,7 +111,7 @@ export default class SaveStateHandler {
         const state = this.getStateFromStorage();
 
         if (state && state.selected_node) {
-            return state.selected_node[0];
+            return state.selected_node[0] || null;
         } else {
             return null;
         }

package/src/scrollHandler.ts

@@ -23,7 +23,7 @@ export default class ScrollHandler {
     public scrollToY(top: number): void {
         this.ensureInit();
 
-        if (this.$scrollParent) {
+        if (this.$scrollParent && this.$scrollParent[0]) {
             this.$scrollParent[0].scrollTop = top;
         } else {
             const offset = this.treeWidget.$el.offset();
@@ -121,7 +121,7 @@ export default class ScrollHandler {
         if (
             $scrollParent &&
             $scrollParent.length &&
-            $scrollParent[0].tagName !== "HTML"
+            $scrollParent[0]?.tagName !== "HTML"
         ) {
             this.$scrollParent = $scrollParent;
 
@@ -223,6 +223,10 @@ export default class ScrollHandler {
 
         const scrollParent = $scrollParent[0];
 
+        if (!scrollParent) {
+            return;
+        }
+
         const canScrollRight =
             scrollParent.scrollLeft + scrollParent.clientWidth <
             scrollParent.scrollWidth;

package/src/selectNodeHandler.ts

@@ -16,7 +16,7 @@ export default class SelectNodeHandler {
         const selectedNodes = this.getSelectedNodes();
 
         if (selectedNodes.length) {
-            return selectedNodes[0];
+            return selectedNodes[0] || false;
         } else {
             return false;
         }

package/src/simple.widget.ts

@@ -94,6 +94,8 @@ const register = (widgetClass: unknown, widgetName: string): void => {
             } else {
                 return callFunction(this, functionName, args);
             }
+        } else {
+            return undefined;
         }
     };
 };

package/src/test/.eslintrc

@@ -11,6 +11,7 @@
     "jest/prefer-expect-assertions": "off",
     "jest/prefer-strict-equal": "off",
     "jest/require-hook": "off",
-    "jest/require-top-level-describe": "off"
+    "jest/require-top-level-describe": "off",
+    "testing-library/no-node-access": "off"
   }
 }

package/src/test/jqTree/accessibility.test.ts

@@ -0,0 +1,25 @@
+import { axe, toHaveNoViolations } from "jest-axe";
+import "../../tree.jquery";
+import exampleData from "../support/exampleData";
+
+expect.extend(toHaveNoViolations);
+
+beforeEach(() => {
+    $("body").append('<div id="tree1"></div>');
+});
+
+afterEach(() => {
+    const $tree = $("#tree1");
+    $tree.tree("destroy");
+    $tree.remove();
+});
+
+it("has an accessible ui", async () => {
+    const $tree = $("#tree1");
+    $tree.tree({
+        data: exampleData,
+    });
+    const element = $tree.get()[0] as HTMLElement;
+
+    await expect(axe(element)).resolves.toHaveNoViolations();
+});

package/src/test/jqTree/events.test.ts

@@ -1,6 +1,7 @@
 import getGiven from "givens";
 import { rest } from "msw";
 import { setupServer } from "msw/node";
+import { waitFor } from "@testing-library/dom";
 import "../../tree.jquery";
 import exampleData from "../support/exampleData";
 import { titleSpan } from "../support/testUtil";
@@ -41,17 +42,15 @@ describe("tree.click", () => {
         given.$tree.tree({ data: exampleData });
     });
 
-    it("fires tree.click", () =>
-        new Promise<void>((done) => {
-            given.$tree.on("tree.click", (e: unknown) => {
-                const treeClickEvent = e as ClickNodeEvent;
+    it("fires tree.click", () => {
+        const onClick = jest.fn();
+        given.$tree.on("tree.click", onClick);
 
-                expect(treeClickEvent.node).toBe(given.node1);
-                done();
-            });
-
-            given.titleSpan.trigger("click");
-        }));
+        given.titleSpan.trigger("click");
+        expect(onClick).toHaveBeenCalledWith(
+            expect.objectContaining({ node: given.node1 })
+        );
+    });
 });
 
 describe("tree.contextmenu", () => {
@@ -70,17 +69,15 @@ describe("tree.contextmenu", () => {
         given.$tree.tree({ data: exampleData });
     });
 
-    it("fires tree.contextmenu", () =>
-        new Promise<void>((done) => {
-            given.$tree.on("tree.contextmenu", (e: unknown) => {
-                const treeClickEvent = e as ClickNodeEvent;
+    it("fires tree.contextmenu", () => {
+        const onContextMenu = jest.fn();
+        given.$tree.on("tree.contextmenu", onContextMenu);
 
-                expect(treeClickEvent.node).toBe(given.node1);
-                done();
-            });
-
-            given.titleSpan.contextmenu();
-        }));
+        given.titleSpan.trigger("contextmenu");
+        expect(onContextMenu).toHaveBeenCalledWith(
+            expect.objectContaining({ node: given.node1 })
+        );
+    });
 });
 
 describe("tree.dblclick", () => {
@@ -99,17 +96,15 @@ describe("tree.dblclick", () => {
         given.$tree.tree({ data: exampleData });
     });
 
-    it("fires tree.dblclick", () =>
-        new Promise<void>((done) => {
-            given.$tree.on("tree.dblclick", (e: unknown) => {
-                const treeClickEvent = e as ClickNodeEvent;
+    it("fires tree.dblclick", () => {
+        const onDoubleClick = jest.fn();
+        given.$tree.on("tree.dblclick", onDoubleClick);
 
-                expect(treeClickEvent.node).toBe(given.node1);
-                done();
-            });
-
-            given.titleSpan.trigger("dblclick");
-        }));
+        given.titleSpan.trigger("dblclick");
+        expect(onDoubleClick).toHaveBeenCalledWith(
+            expect.objectContaining({ node: given.node1 })
+        );
+    });
 });
 
 describe("tree.init", () => {
@@ -120,22 +115,17 @@ describe("tree.init", () => {
     given("$tree", () => $("#tree1"));
 
     context("with json data", () => {
-        it("is called", () =>
-            new Promise<void>((done) => {
-                given.$tree.on("tree.init", () => {
-                    expect(
-                        given.$tree.tree("getNodeByName", "node2")
-                    ).toMatchObject({
-                        id: 124,
-                        name: "node2",
-                    });
-                    done();
-                });
-
-                given.$tree.tree({
-                    data: exampleData,
-                });
-            }));
+        it("is called", () => {
+            const onInit = jest.fn();
+            given.$tree.on("tree.init", onInit);
+
+            given.$tree.tree({
+                data: exampleData,
+            });
+
+            // eslint-disable-next-line jest/prefer-called-with
+            expect(onInit).toHaveBeenCalled();
+        });
     });
 
     context("with data loaded from an url", () => {
@@ -147,20 +137,17 @@ describe("tree.init", () => {
             );
         });
 
-        it("is called", () =>
-            new Promise<void>((done) => {
-                given.$tree.on("tree.init", () => {
-                    expect(
-                        given.$tree.tree("getNodeByName", "node2")
-                    ).toMatchObject({
-                        id: 124,
-                        name: "node2",
-                    });
-                    done();
-                });
-
-                given.$tree.tree({ dataUrl: "/tree/" });
-            }));
+        it("is called", async () => {
+            const onInit = jest.fn();
+            given.$tree.on("tree.init", onInit);
+
+            given.$tree.tree({ dataUrl: "/tree/" });
+
+            await waitFor(() => {
+                // eslint-disable-next-line jest/prefer-called-with
+                expect(onInit).toHaveBeenCalled();
+            });
+        });
     });
 });
 
@@ -172,16 +159,15 @@ describe("tree.load_data", () => {
     given("$tree", () => $("#tree1"));
 
     context("when the tree is initialized with data", () => {
-        it("fires tree.load_data", () =>
-            new Promise<void>((resolve) => {
-                given.$tree.on("tree.load_data", (e: any) => {
-                    // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
-                    expect(e.tree_data).toEqual(exampleData);
-                    resolve();
-                });
-
-                given.$tree.tree({ data: exampleData });
-            }));
+        it("fires tree.load_data", () => {
+            const onLoadData = jest.fn();
+            given.$tree.on("tree.load_data", onLoadData);
+
+            given.$tree.tree({ data: exampleData });
+            expect(onLoadData).toHaveBeenCalledWith(
+                expect.objectContaining({ tree_data: exampleData })
+            );
+        });
     });
 });
 
@@ -203,35 +189,35 @@ describe("tree.select", () => {
         });
     });
 
-    it("fires tree.click", () =>
-        new Promise<void>((done) => {
-            given.$tree.on("tree.select", (e: unknown) => {
-                const treeClickEvent = e as ClickNodeEvent;
-
-                expect(treeClickEvent.node).toBe(given.node1);
-                expect(treeClickEvent.deselected_node).toBeNull();
-                done();
-            });
-
-            given.titleSpan.trigger("click");
-        }));
+    it("fires tree.select", () => {
+        const onSelect = jest.fn();
+        given.$tree.on("tree.select", onSelect);
+
+        given.titleSpan.trigger("click");
+        expect(onSelect).toHaveBeenCalledWith(
+            expect.objectContaining({
+                node: given.node1,
+                deselected_node: null,
+            })
+        );
+    });
 
     context("when the node was selected", () => {
         beforeEach(() => {
             given.$tree.tree("selectNode", given.node1);
         });
 
-        it("fires tree.select with node is null", () =>
-            new Promise<void>((done) => {
-                given.$tree.on("tree.select", (e: unknown) => {
-                    const treeClickEvent = e as ClickNodeEvent;
-
-                    expect(treeClickEvent.node).toBeNull();
-                    expect(treeClickEvent.previous_node).toBe(given.node1);
-                    done();
-                });
+        it("fires tree.select with node is null", () => {
+            const onSelect = jest.fn();
+            given.$tree.on("tree.select", onSelect);
 
-                given.titleSpan.trigger("click");
-            }));
+            given.titleSpan.trigger("click");
+            expect(onSelect).toHaveBeenCalledWith(
+                expect.objectContaining({
+                    node: null,
+                    previous_node: given.node1,
+                })
+            );
+        });
     });
 });

package/src/test/jqTree/loadOnDemand.test.ts

@@ -53,12 +53,12 @@ context("when a node has load_on_demand in the data", () => {
                 if (parentId === "1") {
                     return response(
                         ctx.status(200),
-                        ctx.json([{ id: 2, name: "loaded-on-demand" }])
+                        ctx.json([{ id: 2, name: "loaded-on-demand" }]),
                     );
                 } else {
                     return response(ctx.status(400));
                 }
-            })
+            }),
         );
     });
 
@@ -87,7 +87,7 @@ context("when a node has load_on_demand in the data", () => {
 
     context("when the node is opened", () => {
         given("node", () =>
-            given.$tree.tree("getNodeByNameMustExist", "parent-node")
+            given.$tree.tree("getNodeByNameMustExist", "parent-node"),
         );
 
         it("loads the subtree", async () => {
@@ -136,8 +136,9 @@ context("when a node has load_on_demand in the data", () => {
 
         context("when the node is selected and doesn't have the focus", () => {
             beforeEach(() => {
-                given.$tree.tree("selectNode", given.node);
-                (document.activeElement as HTMLElement).blur();
+                given.$tree.tree("selectNode", given.node, {
+                    mustSetFocus: false,
+                });
             });
 
             it("keeps the node selected and not focused", async () => {

package/src/test/jqTree/methods.test.ts

@@ -146,7 +146,7 @@ describe("addToSelection", () => {
 
     it("selects the nodes", () => {
         expect(given.$tree.tree("getSelectedNodes")).toEqual(
-            expect.arrayContaining([given.child1, given.child2])
+            expect.arrayContaining([given.child1, given.child2]),
         );
     });
 
@@ -207,7 +207,7 @@ describe("appendNode", () => {
 
     context("when appending to a parent node", () => {
         given("parent", () =>
-            given.$tree.tree("getNodeByNameMustExist", "node1")
+            given.$tree.tree("getNodeByNameMustExist", "node1"),
         );
 
         it("appends the node to parent node", () => {
@@ -244,7 +244,7 @@ describe("appendNode", () => {
 
         it("sets the properties of the object", () => {
             expect(given.$tree.tree("getNodeById", 99)).toMatchObject(
-                given.nodeData
+                given.nodeData,
             );
         });
     });
@@ -302,7 +302,7 @@ describe("getNodeByHtmlElement", () => {
 
     const given = getGiven<Vars>();
     given("htmlElement", () =>
-        screen.getByText("node1", { selector: ".jqtree-title" })
+        screen.getByText("node1", { selector: ".jqtree-title" }),
     );
     given("$tree", () => $("#tree1"));
 
@@ -312,7 +312,7 @@ describe("getNodeByHtmlElement", () => {
 
     it("returns the node", () => {
         expect(
-            given.$tree.tree("getNodeByHtmlElement", given.htmlElement)
+            given.$tree.tree("getNodeByHtmlElement", given.htmlElement),
         ).toEqual(expect.objectContaining({ name: "node1" }));
     });
 });
@@ -394,7 +394,7 @@ describe("getNodesByProperty", () => {
 
     it("gets nodes by property", () => {
         expect(
-            given.$tree.tree("getNodesByProperty", "intProperty", 1)
+            given.$tree.tree("getNodesByProperty", "intProperty", 1),
         ).toEqual([given.node1]);
     });
 });
@@ -417,7 +417,7 @@ describe("getSelectedNode", () => {
 
     context("when nodes have ids", () => {
         given("node", () =>
-            given.$tree.tree("getNodeByNameMustExist", "node1")
+            given.$tree.tree("getNodeByNameMustExist", "node1"),
         );
         given("treeData", () => exampleData);
 
@@ -440,7 +440,7 @@ describe("getSelectedNode", () => {
 
     context("when nodes don't have ids", () => {
         given("node", () =>
-            given.$tree.tree("getNodeByNameMustExist", "without-id1")
+            given.$tree.tree("getNodeByNameMustExist", "without-id1"),
         );
         given("treeData", () => ["without-id1", "without-id2"]);
 
@@ -494,7 +494,7 @@ describe("getSelectedNodes", () => {
 
         it("returns the selected nodes", () => {
             expect(given.$tree.tree("getSelectedNodes")).toEqual(
-                expect.arrayContaining([given.child1, given.child2])
+                expect.arrayContaining([given.child1, given.child2]),
             );
         });
     });
@@ -659,7 +659,7 @@ describe("loadData", () => {
             given.$tree.tree(
                 "loadData",
                 exampleData,
-                given.$tree.tree("getNodeByNameMustExist", "initial1")
+                given.$tree.tree("getNodeByNameMustExist", "initial1"),
             );
         });
 
@@ -688,7 +688,7 @@ describe("loadData", () => {
         beforeEach(() => {
             given.$tree.tree(
                 "selectNode",
-                given.$tree.tree("getNodeByNameMustExist", "child1")
+                given.$tree.tree("getNodeByNameMustExist", "child1"),
             );
         });
 
@@ -696,7 +696,7 @@ describe("loadData", () => {
             given.$tree.tree(
                 "loadData",
                 ["new-child1"],
-                given.$tree.tree("getNodeByNameMustExist", "node1")
+                given.$tree.tree("getNodeByNameMustExist", "node1"),
             );
 
             expect(given.$tree.tree("getSelectedNode")).toBeFalse();
@@ -712,7 +712,7 @@ describe("loadData", () => {
                 given.$tree.tree(
                     "loadData",
                     ["new-child1"],
-                    given.$tree.tree("getNodeByNameMustExist", "node1")
+                    given.$tree.tree("getNodeByNameMustExist", "node1"),
                 );
 
                 expect(given.$tree.tree("getSelectedNode")).toBeFalse();
@@ -723,7 +723,7 @@ describe("loadData", () => {
                     given.$tree.tree(
                         "loadData",
                         ["new-child1"],
-                        given.$tree.tree("getNodeByNameMustExist", "node2")
+                        given.$tree.tree("getNodeByNameMustExist", "node2"),
                     );
 
                     expect(given.$tree.tree("getSelectedNode")).toMatchObject({
@@ -750,8 +750,8 @@ describe("loadDataFromUrl", () => {
     beforeEach(() => {
         server.use(
             rest.get("/tree/", (_request, response, ctx) =>
-                response(ctx.status(200), ctx.json(given.serverData))
-            )
+                response(ctx.status(200), ctx.json(given.serverData)),
+            ),
         );
 
         given.$tree.tree({ data: given.initialData });
@@ -775,7 +775,7 @@ describe("loadDataFromUrl", () => {
             it("loads a subtree", async () => {
                 const parentNode = given.$tree.tree(
                     "getNodeByNameMustExist",
-                    "initial1"
+                    "initial1",
                 );
                 given.$tree.tree("loadDataFromUrl", "/tree/", parentNode);
                 await screen.findByText("new1");
@@ -949,7 +949,7 @@ describe("prependNode", () => {
 
     context("with a parent node", () => {
         given("parent", () =>
-            given.$tree.tree("getNodeByNameMustExist", "node1")
+            given.$tree.tree("getNodeByNameMustExist", "node1"),
         );
 
         it("prepends the node to the parent", () => {
@@ -984,7 +984,7 @@ describe("refresh", () => {
 
     it("rerenders the tree", () => {
         const tree = given.$tree.tree("getTree");
-        tree.children[0].name = "node1a";
+        (tree.children[0] as INode).name = "node1a";
 
         expect(given.$tree).toHaveTreeStructure([
             expect.objectContaining({ name: "node1" }),
@@ -1013,8 +1013,8 @@ describe("reload", () => {
     beforeEach(async () => {
         server.use(
             rest.get("/tree2/", (_request, response, ctx) =>
-                response(ctx.status(200), ctx.json(exampleData))
-            )
+                response(ctx.status(200), ctx.json(exampleData)),
+            ),
         );
 
         given.$tree.tree({ dataUrl: "/tree2/" });
@@ -1070,7 +1070,7 @@ describe("removeNode", () => {
 
     context("with a child node", () => {
         given("node", () =>
-            given.$tree.tree("getNodeByNameMustExist", "child1")
+            given.$tree.tree("getNodeByNameMustExist", "child1"),
         );
 
         it("removes the node", () => {
@@ -1103,7 +1103,7 @@ describe("removeNode", () => {
 
     context("with a parent node and its children", () => {
         given("node", () =>
-            given.$tree.tree("getNodeByNameMustExist", "node1")
+            given.$tree.tree("getNodeByNameMustExist", "node1"),
         );
 
         it("removes the node", () => {
@@ -1121,7 +1121,7 @@ describe("removeNode", () => {
             beforeEach(() => {
                 const child1 = given.$tree.tree(
                     "getNodeByNameMustExist",
-                    "child1"
+                    "child1",
                 );
                 given.$tree.tree("selectNode", child1);
             });
@@ -1139,7 +1139,7 @@ describe("removeNode", () => {
 
         it("raises an exception", () => {
             expect(() => given.$tree.tree("removeNode", given.node)).toThrow(
-                "Node has no parent"
+                "Node has no parent",
             );
         });
     });
@@ -1382,7 +1382,7 @@ describe("updateNode", () => {
                 expect.objectContaining({ name: "node2" }),
             ]);
             expect(given.$tree.tree("getNodeById", 999)).toMatchObject(
-                given.nodeData
+                given.nodeData,
             );
         });
     });
@@ -1406,7 +1406,7 @@ describe("updateNode", () => {
         context("when adding a child to a child node", () => {
             given("nodeData", () => ({ children: ["new-child"] }));
             given("node", () =>
-                given.$tree.tree("getNodeByNameMustExist", "child1")
+                given.$tree.tree("getNodeByNameMustExist", "child1"),
             );
 
             it("adds the child node", () => {