jqtree 1.7.0 → 1.7.2

package/src/test/jqTree/options.test.ts

@@ -164,6 +164,56 @@ describe("autoOpen", () => {
     });
 });
 
+describe("closedIcon", () => {
+    it("renders a string", () => {
+        const $tree = $("#tree1");
+        $tree.tree({
+            closedIcon: "closed",
+            data: exampleData,
+        });
+
+        const $button = $tree.find("a.jqtree-toggler:first");
+        expect($button.text()).toBe("closed");
+    });
+
+    it("escapes html", () => {
+        const $tree = $("#tree1");
+        $tree.tree({
+            closedIcon: "<span>test</span>",
+            data: exampleData,
+        });
+
+        const $button = $tree.find("a.jqtree-toggler:first");
+        expect($button.text()).toBe("<span>test</span>");
+    });
+
+    it("renders a jquery element", () => {
+        const $tree = $("#tree1");
+        $tree.tree({
+            closedIcon: $("<span class='abc'>test</span>"),
+            data: exampleData,
+        });
+
+        const $span = $tree.find("a.jqtree-toggler:first span.abc");
+        expect($span.text()).toBe("test");
+    });
+
+    it("renders a html element", () => {
+        const closedIcon = document.createElement("span");
+        closedIcon.className = "abc";
+        closedIcon.textContent = "test";
+
+        const $tree = $("#tree1");
+        $tree.tree({
+            closedIcon,
+            data: exampleData,
+        });
+
+        const $span = $tree.find("a.jqtree-toggler:first span.abc");
+        expect($span.text()).toBe("test");
+    });
+});
+
 describe("dataUrl", () => {
     const exampleStructure = [
         expect.objectContaining({ name: "node1" }),
@@ -201,7 +251,7 @@ describe("dataUrl", () => {
                 const data = nodeName ? [nodeName] : exampleData;
 
                 return response(ctx.status(200), ctx.json(data));
-            })
+            }),
         );
     });
 
@@ -323,7 +373,7 @@ describe("onGetStateFromStorage and onSetStateFromStorage", () => {
             JSON.stringify({
                 open_nodes: [123],
                 selected_node: [123],
-            })
+            }),
         );
 
         it("restores the state", () => {
@@ -351,8 +401,11 @@ describe("onLoadFailed", () => {
         beforeEach(() => {
             server.use(
                 rest.get("/tree/", (_request, response, ctx) =>
-                    response(ctx.status(500), ctx.body("Internal server error"))
-                )
+                    response(
+                        ctx.status(500),
+                        ctx.body("Internal server error"),
+                    ),
+                ),
             );
         });
 
@@ -366,7 +419,7 @@ describe("onLoadFailed", () => {
 
             await waitFor(() => {
                 expect(onLoadFailed).toHaveBeenCalledWith(
-                    expect.objectContaining({ status: 500 })
+                    expect.objectContaining({ status: 500 }),
                 );
             });
         });
@@ -432,7 +485,7 @@ describe("saveState", () => {
 
             it("saves the state to local storage", () => {
                 expect(localStorage.getItem("tree")).toBe(
-                    '{"open_nodes":[123],"selected_node":[123]}'
+                    '{"open_nodes":[123],"selected_node":[123]}',
                 );
             });
         });
@@ -442,7 +495,7 @@ describe("saveState", () => {
 
             it("uses the string as a key", () => {
                 expect(localStorage.getItem("my-state")).toBe(
-                    '{"open_nodes":[123],"selected_node":[123]}'
+                    '{"open_nodes":[123],"selected_node":[123]}',
                 );
             });
         });
@@ -462,7 +515,7 @@ describe("saveState", () => {
         beforeEach(() => {
             localStorage.setItem(
                 "tree",
-                '{"open_nodes":[123],"selected_node":[123]}'
+                '{"open_nodes":[123],"selected_node":[123]}',
             );
 
             given.$tree.tree({

package/src/test/node.test.ts

@@ -164,7 +164,7 @@ describe("addChild", () => {
     });
 
     it("sets the parent of the child", () => {
-        expect(given.node.children[0].parent).toEqual(given.node);
+        expect(given.node.children[0]?.parent).toEqual(given.node);
     });
 });
 
@@ -538,14 +538,16 @@ describe("getLastChild", () => {
         context("when its last child is open and has children", () => {
             beforeEach(() => {
                 const child2 = given.node.children[1];
-                child2.append("child2a");
-                child2.append("child2b");
+                child2?.append("child2a");
+                child2?.append("child2b");
             });
 
             context("and the last child is open", () => {
                 beforeEach(() => {
                     const child2 = given.node.children[1];
-                    child2.is_open = true;
+                    if (child2) {
+                        child2.is_open = true;
+                    }
                 });
 
                 it("returns the last child of that child", () => {

package/src/test/nodeUtil.test.ts

@@ -24,7 +24,7 @@ describe("getPositionName", () => {
 
     context("with an unknown position", () => {
         it("returns an empty string", () => {
-            expect(getPositionName(10)).toBe("");
+            expect(getPositionName(10 as Position)).toBe("");
         });
     });
 });

package/src/tree.jquery.d.ts

@@ -34,6 +34,11 @@ interface ClickNodeEvent {
     previous_node?: INode;
 }
 
+interface SelectNodeOptions {
+    mustToggle?: boolean;
+    mustSetFocus?: boolean;
+}
+
 interface SavedState {
     open_nodes: NodeId[];
     selected_node: NodeId[];
@@ -44,7 +49,7 @@ interface IJQTreeOptions {
     autoEscape?: boolean;
     autoOpen?: boolean | number | string;
     buttonLeft?: boolean;
-    closedIcon?: string | Element;
+    closedIcon?: string | HTMLElement | JQuery<HTMLElement>;
     data?: NodeData[];
     dataFilter?: (data: NodeData[]) => NodeData[];
     dataUrl?: DataUrl;
@@ -61,7 +66,7 @@ interface IJQTreeOptions {
     onLoading?: (isLoading: boolean, node: INode, $el: JQuery) => void;
     onGetStateFromStorage?: () => string;
     onSetStateFromStorage?: (data: string) => void;
-    openedIcon?: string | Element;
+    openedIcon?: string | HTMLElement | JQuery<HTMLElement>;
     openFolderDelay?: number | false;
     rtl?: boolean;
     selectable?: boolean;
@@ -79,17 +84,17 @@ interface IJQTreePlugin {
     (
         behavior: "addNodeAfter",
         newNodeInfo: NodeData,
-        existingNode: INode
+        existingNode: INode,
     ): INode | null;
     (
         behavior: "addNodeBefore",
         newNodeInfo: NodeData,
-        existingNode: INode
+        existingNode: INode,
     ): INode | null;
     (
         behavior: "addParentNode",
         newNodeInfo: NodeData,
-        existingNode: INode
+        existingNode: INode,
     ): INode | null;
     (behavior: "addToSelection", node: INode, mustSetFocus?: boolean): JQuery;
     (behavior: "appendNode", newNodeInfo: NodeData, parentNode?: INode): INode;
@@ -97,7 +102,7 @@ interface IJQTreePlugin {
     (behavior: "destroy"): void;
     (
         behavior: "getNodeByCallback",
-        callback: (node: INode) => boolean
+        callback: (node: INode) => boolean,
     ): INode | null;
     (behavior: "getNodeByHtmlElement", element: Element | JQuery): INode | null;
     (behavior: "getNodeById", id: NodeId): INode | null;
@@ -116,14 +121,14 @@ interface IJQTreePlugin {
         behavior: "loadDataFromUrl",
         param1?: string | null | INode,
         param2?: INode | null | (() => void),
-        param3?: () => void
+        param3?: () => void,
     ): JQuery;
     (behavior: "moveDown"): JQuery;
     (
         behavior: "moveNode",
         node: INode,
         targetNode: INode,
-        position: string
+        position: string,
     ): JQuery;
     (behavior: "moveUp"): JQuery;
     (behavior: "openNode", node: INode): JQuery;
@@ -131,13 +136,13 @@ interface IJQTreePlugin {
     (
         behavior: "openNode",
         node: INode,
-        onFinished: (node: INode) => void
+        onFinished: (node: INode) => void,
     ): JQuery;
     (
         behavior: "openNode",
         node: INode,
         slide: boolean,
-        onFinished?: (node: INode) => void
+        onFinished?: (node: INode) => void,
     ): JQuery;
     (behavior: "prependNode", newNodeInfo: NodeData, parentNode?: INode): INode;
     (behavior: "refresh"): JQuery;
@@ -145,7 +150,11 @@ interface IJQTreePlugin {
     (behavior: "removeFromSelection", node: INode): JQuery;
     (behavior: "removeNode", node: INode): JQuery;
     (behavior: "scrollToNode", node: INode): JQuery;
-    (behavior: "selectNode", node: INode | null): JQuery;
+    (
+        behavior: "selectNode",
+        node: INode | null,
+        optionsParam?: SelectNodeOptions,
+    ): JQuery;
     (behavior: "setOption", option: string, value: unknown): JQuery;
     (behavior: "setState", options: Record<string, unknown>): JQuery;
     (behavior: "toggle", node: INode, slideParam?: boolean): JQuery;

package/src/tree.jquery.ts

@@ -777,7 +777,7 @@ export class JqTreeWidget extends MouseWidget<JQTreeOptions> {
     // Set initial state, either by restoring the state or auto-opening nodes
     // result: must load nodes on demand?
     private setInitialState(): boolean {
-        const restoreState = (): boolean[] => {
+        const restoreState = (): [boolean, boolean] => {
             // result: is state restored, must load on demand?
             if (!this.options.saveState) {
                 return [false, false];

package/src/version.ts

@@ -1,3 +1,3 @@
-const version = "1.7.0";
+const version = "1.7.2";
 
 export default version;