jqtree 1.6.3 → 1.7.1

package/tree.jquery.debug.js

@@ -1,7 +1,7 @@
 /*
-JqTree 1.6.3
+JqTree 1.7.1
 
-Copyright 2022 Marco Braak
+Copyright 2023 Marco Braak
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -20,19 +20,43 @@ limitations under the License.
 var jqtree = (function (exports) {
   'use strict';
 
+  function _iterableToArrayLimit(arr, i) {
+    var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"];
+    if (null != _i) {
+      var _s,
+        _e,
+        _x,
+        _r,
+        _arr = [],
+        _n = !0,
+        _d = !1;
+      try {
+        if (_x = (_i = _i.call(arr)).next, 0 === i) {
+          if (Object(_i) !== _i) return;
+          _n = !1;
+        } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0);
+      } catch (err) {
+        _d = !0, _e = err;
+      } finally {
+        try {
+          if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return;
+        } finally {
+          if (_d) throw _e;
+        }
+      }
+      return _arr;
+    }
+  }
   function ownKeys(object, enumerableOnly) {
     var keys = Object.keys(object);
-
     if (Object.getOwnPropertySymbols) {
       var symbols = Object.getOwnPropertySymbols(object);
       enumerableOnly && (symbols = symbols.filter(function (sym) {
         return Object.getOwnPropertyDescriptor(object, sym).enumerable;
       })), keys.push.apply(keys, symbols);
     }
-
     return keys;
   }
-
   function _objectSpread2(target) {
     for (var i = 1; i < arguments.length; i++) {
       var source = null != arguments[i] ? arguments[i] : {};
@@ -42,10 +66,8 @@ var jqtree = (function (exports) {
         Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key));
       });
     }
-
     return target;
   }
-
   function _typeof(obj) {
     "@babel/helpers - typeof";
 
@@ -55,23 +77,20 @@ var jqtree = (function (exports) {
       return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj;
     }, _typeof(obj);
   }
-
   function _classCallCheck(instance, Constructor) {
     if (!(instance instanceof Constructor)) {
       throw new TypeError("Cannot call a class as a function");
     }
   }
-
   function _defineProperties(target, props) {
     for (var i = 0; i < props.length; i++) {
       var descriptor = props[i];
       descriptor.enumerable = descriptor.enumerable || false;
       descriptor.configurable = true;
       if ("value" in descriptor) descriptor.writable = true;
-      Object.defineProperty(target, descriptor.key, descriptor);
+      Object.defineProperty(target, _toPropertyKey(descriptor.key), descriptor);
     }
   }
-
   function _createClass(Constructor, protoProps, staticProps) {
     if (protoProps) _defineProperties(Constructor.prototype, protoProps);
     if (staticProps) _defineProperties(Constructor, staticProps);
@@ -80,8 +99,8 @@ var jqtree = (function (exports) {
     });
     return Constructor;
   }
-
   function _defineProperty(obj, key, value) {
+    key = _toPropertyKey(key);
     if (key in obj) {
       Object.defineProperty(obj, key, {
         value: value,
@@ -92,15 +111,12 @@ var jqtree = (function (exports) {
     } else {
       obj[key] = value;
     }
-
     return obj;
   }
-
   function _inherits(subClass, superClass) {
     if (typeof superClass !== "function" && superClass !== null) {
       throw new TypeError("Super expression must either be null or a function");
     }
-
     subClass.prototype = Object.create(superClass && superClass.prototype, {
       constructor: {
         value: subClass,
@@ -113,14 +129,12 @@ var jqtree = (function (exports) {
     });
     if (superClass) _setPrototypeOf(subClass, superClass);
   }
-
   function _getPrototypeOf(o) {
     _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf.bind() : function _getPrototypeOf(o) {
       return o.__proto__ || Object.getPrototypeOf(o);
     };
     return _getPrototypeOf(o);
   }
-
   function _setPrototypeOf(o, p) {
     _setPrototypeOf = Object.setPrototypeOf ? Object.setPrototypeOf.bind() : function _setPrototypeOf(o, p) {
       o.__proto__ = p;
@@ -128,12 +142,10 @@ var jqtree = (function (exports) {
     };
     return _setPrototypeOf(o, p);
   }
-
   function _isNativeReflectConstruct() {
     if (typeof Reflect === "undefined" || !Reflect.construct) return false;
     if (Reflect.construct.sham) return false;
     if (typeof Proxy === "function") return true;
-
     try {
       Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {}));
       return true;
@@ -141,112 +153,63 @@ var jqtree = (function (exports) {
       return false;
     }
   }
-
   function _assertThisInitialized(self) {
     if (self === void 0) {
       throw new ReferenceError("this hasn't been initialised - super() hasn't been called");
     }
-
     return self;
   }
-
   function _possibleConstructorReturn(self, call) {
     if (call && (typeof call === "object" || typeof call === "function")) {
       return call;
     } else if (call !== void 0) {
       throw new TypeError("Derived constructors may only return object or undefined");
     }
-
     return _assertThisInitialized(self);
   }
-
   function _createSuper(Derived) {
     var hasNativeReflectConstruct = _isNativeReflectConstruct();
-
     return function _createSuperInternal() {
       var Super = _getPrototypeOf(Derived),
-          result;
-
+        result;
       if (hasNativeReflectConstruct) {
         var NewTarget = _getPrototypeOf(this).constructor;
-
         result = Reflect.construct(Super, arguments, NewTarget);
       } else {
         result = Super.apply(this, arguments);
       }
-
       return _possibleConstructorReturn(this, result);
     };
   }
-
   function _superPropBase(object, property) {
     while (!Object.prototype.hasOwnProperty.call(object, property)) {
       object = _getPrototypeOf(object);
       if (object === null) break;
     }
-
     return object;
   }
-
   function _get() {
     if (typeof Reflect !== "undefined" && Reflect.get) {
       _get = Reflect.get.bind();
     } else {
       _get = function _get(target, property, receiver) {
         var base = _superPropBase(target, property);
-
         if (!base) return;
         var desc = Object.getOwnPropertyDescriptor(base, property);
-
         if (desc.get) {
           return desc.get.call(arguments.length < 3 ? target : receiver);
         }
-
         return desc.value;
       };
     }
-
     return _get.apply(this, arguments);
   }
-
   function _slicedToArray(arr, i) {
     return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest();
   }
-
   function _arrayWithHoles(arr) {
     if (Array.isArray(arr)) return arr;
   }
-
-  function _iterableToArrayLimit(arr, i) {
-    var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"];
-
-    if (_i == null) return;
-    var _arr = [];
-    var _n = true;
-    var _d = false;
-
-    var _s, _e;
-
-    try {
-      for (_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true) {
-        _arr.push(_s.value);
-
-        if (i && _arr.length === i) break;
-      }
-    } catch (err) {
-      _d = true;
-      _e = err;
-    } finally {
-      try {
-        if (!_n && _i["return"] != null) _i["return"]();
-      } finally {
-        if (_d) throw _e;
-      }
-    }
-
-    return _arr;
-  }
-
   function _unsupportedIterableToArray(o, minLen) {
     if (!o) return;
     if (typeof o === "string") return _arrayLikeToArray(o, minLen);
@@ -255,29 +218,21 @@ var jqtree = (function (exports) {
     if (n === "Map" || n === "Set") return Array.from(o);
     if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen);
   }
-
   function _arrayLikeToArray(arr, len) {
     if (len == null || len > arr.length) len = arr.length;
-
     for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i];
-
     return arr2;
   }
-
   function _nonIterableRest() {
     throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
   }
-
   function _createForOfIteratorHelper(o, allowArrayLike) {
     var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"];
-
     if (!it) {
       if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") {
         if (it) o = it;
         var i = 0;
-
         var F = function () {};
-
         return {
           s: F,
           n: function () {
@@ -295,13 +250,11 @@ var jqtree = (function (exports) {
           f: F
         };
       }
-
       throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
     }
-
     var normalCompletion = true,
-        didErr = false,
-        err;
+      didErr = false,
+      err;
     return {
       s: function () {
         it = it.call(o);
@@ -324,18 +277,30 @@ var jqtree = (function (exports) {
       }
     };
   }
+  function _toPrimitive(input, hint) {
+    if (typeof input !== "object" || input === null) return input;
+    var prim = input[Symbol.toPrimitive];
+    if (prim !== undefined) {
+      var res = prim.call(input, hint || "default");
+      if (typeof res !== "object") return res;
+      throw new TypeError("@@toPrimitive must return a primitive value.");
+    }
+    return (hint === "string" ? String : Number)(input);
+  }
+  function _toPropertyKey(arg) {
+    var key = _toPrimitive(arg, "string");
+    return typeof key === "symbol" ? key : String(key);
+  }
 
-  var version = "1.6.2";
-
-  var Position;
+  var version = "1.7.1";
 
-  (function (Position) {
+  var Position = /*#__PURE__*/function (Position) {
     Position[Position["Before"] = 1] = "Before";
     Position[Position["After"] = 2] = "After";
     Position[Position["Inside"] = 3] = "Inside";
     Position[Position["None"] = 4] = "None";
-  })(Position || (Position = {}));
-
+    return Position;
+  }({});
   var positionNames = {
     before: Position.Before,
     after: Position.After,
@@ -350,62 +315,45 @@ var jqtree = (function (exports) {
         }
       }
     }
-
     return "";
   };
   var getPosition = function getPosition(name) {
     return positionNames[name];
   };
-
   var isNodeRecordWithChildren = function isNodeRecordWithChildren(data) {
     return _typeof(data) === "object" && "children" in data && data["children"] instanceof Array;
   };
-
   var Node = /*#__PURE__*/function () {
     function Node() {
       var o = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : null;
       var isRoot = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
       var nodeClass = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : Node;
-
       _classCallCheck(this, Node);
-
       _defineProperty(this, "id", void 0);
-
       _defineProperty(this, "name", void 0);
-
       _defineProperty(this, "children", void 0);
-
       _defineProperty(this, "parent", void 0);
-
       _defineProperty(this, "idMapping", void 0);
-
       _defineProperty(this, "tree", void 0);
-
       _defineProperty(this, "nodeClass", void 0);
-
       _defineProperty(this, "load_on_demand", void 0);
-
       _defineProperty(this, "is_open", void 0);
-
       _defineProperty(this, "element", void 0);
-
       _defineProperty(this, "is_loading", void 0);
-
       _defineProperty(this, "isEmptyFolder", void 0);
-
       this.name = "";
       this.isEmptyFolder = false;
       this.load_on_demand = false;
       this.setData(o);
       this.children = [];
       this.parent = null;
-
       if (isRoot) {
         this.idMapping = new Map();
         this.tree = this;
         this.nodeClass = nodeClass;
       }
     }
+
     /*
     Set the data of this node.
      setData(string): set the name of the node
@@ -417,8 +365,6 @@ var jqtree = (function (exports) {
      * This is an internal function; it is not in the docs
     * Does not remove existing node values
     */
-
-
     _createClass(Node, [{
       key: "setData",
       value: function setData(o) {
@@ -430,7 +376,6 @@ var jqtree = (function (exports) {
           for (var _key in o) {
             if (Object.prototype.hasOwnProperty.call(o, _key)) {
               var value = o[_key];
-
               if (_key === "label" || _key === "name") {
                 // You can use the 'label' key instead of 'name'; this is a legacy feature
                 if (typeof value === "string") {
@@ -444,6 +389,7 @@ var jqtree = (function (exports) {
           }
         }
       }
+
       /*
       Create tree from data.
        Structure of data is:
@@ -460,23 +406,17 @@ var jqtree = (function (exports) {
           }
       ]
       */
-
     }, {
       key: "loadFromData",
       value: function loadFromData(data) {
         this.removeChildren();
-
         var _iterator = _createForOfIteratorHelper(data),
-            _step;
-
+          _step;
         try {
           for (_iterator.s(); !(_step = _iterator.n()).done;) {
             var o = _step.value;
-
             var _node = this.createNode(o);
-
             this.addChild(_node);
-
             if (isNodeRecordWithChildren(o)) {
               if (o.children.length === 0) {
                 _node.isEmptyFolder = true;
@@ -490,22 +430,22 @@ var jqtree = (function (exports) {
         } finally {
           _iterator.f();
         }
-
         return this;
       }
+
       /*
       Add child.
        tree.addChild(
           new Node('child1')
       );
       */
-
     }, {
       key: "addChild",
       value: function addChild(node) {
         this.children.push(node);
         node.setParent(this);
       }
+
       /*
       Add child at position. Index starts at 0.
        tree.addChildAtPosition(
@@ -513,18 +453,17 @@ var jqtree = (function (exports) {
           1
       );
       */
-
     }, {
       key: "addChildAtPosition",
       value: function addChildAtPosition(node, index) {
         this.children.splice(index, 0, node);
         node.setParent(this);
       }
+
       /*
       Remove child. This also removes the children of the node.
        tree.removeChild(tree.children[0]);
       */
-
     }, {
       key: "removeChild",
       value: function removeChild(node) {
@@ -532,23 +471,23 @@ var jqtree = (function (exports) {
         node.removeChildren();
         this.doRemoveChild(node);
       }
+
       /*
       Get child index.
        var index = getChildIndex(node);
       */
-
     }, {
       key: "getChildIndex",
       value: function getChildIndex(node) {
         return this.children.indexOf(node);
       }
+
       /*
       Does the tree have children?
        if (tree.hasChildren()) {
           //
       }
       */
-
     }, {
       key: "hasChildren",
       value: function hasChildren() {
@@ -559,6 +498,7 @@ var jqtree = (function (exports) {
       value: function isFolder() {
         return this.hasChildren() || this.load_on_demand;
       }
+
       /*
       Iterate over all the nodes in the tree.
        Calls callback with (node, level).
@@ -571,20 +511,17 @@ var jqtree = (function (exports) {
           }
       );
        */
-
     }, {
       key: "iterate",
       value: function iterate(callback) {
         var _iterate = function _iterate(node, level) {
           if (node.children) {
             var _iterator2 = _createForOfIteratorHelper(node.children),
-                _step2;
-
+              _step2;
             try {
               for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
                 var child = _step2.value;
                 var result = callback(child, level);
-
                 if (result && child.hasChildren()) {
                   _iterate(child, level + 1);
                 }
@@ -596,16 +533,15 @@ var jqtree = (function (exports) {
             }
           }
         };
-
         _iterate(this, 0);
       }
+
       /*
       Move node relative to another node.
        Argument position: Position.BEFORE, Position.AFTER or Position.Inside
        // move node1 after node2
       tree.moveNode(node1, node2, Position.AFTER);
       */
-
     }, {
       key: "moveNode",
       value: function moveNode(movedNode, targetNode, position) {
@@ -615,7 +551,6 @@ var jqtree = (function (exports) {
           return false;
         } else {
           movedNode.parent.doRemoveChild(movedNode);
-
           switch (position) {
             case Position.After:
               {
@@ -623,60 +558,50 @@ var jqtree = (function (exports) {
                   targetNode.parent.addChildAtPosition(movedNode, targetNode.parent.getChildIndex(targetNode) + 1);
                   return true;
                 }
-
                 return false;
               }
-
             case Position.Before:
               {
                 if (targetNode.parent) {
                   targetNode.parent.addChildAtPosition(movedNode, targetNode.parent.getChildIndex(targetNode));
                   return true;
                 }
-
                 return false;
               }
-
             case Position.Inside:
               {
                 // move inside as first child
                 targetNode.addChildAtPosition(movedNode, 0);
                 return true;
               }
-
             default:
               return false;
           }
         }
       }
+
       /*
       Get the tree as data.
       */
-
     }, {
       key: "getData",
       value: function getData() {
         var includeParent = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
-
         var getDataFromNodes = function getDataFromNodes(nodes) {
           return nodes.map(function (node) {
             var tmpNode = {};
-
             for (var k in node) {
               if (["parent", "children", "element", "idMapping", "load_on_demand", "nodeClass", "tree", "isEmptyFolder"].indexOf(k) === -1 && Object.prototype.hasOwnProperty.call(node, k)) {
                 var v = node[k];
                 tmpNode[k] = v;
               }
             }
-
             if (node.hasChildren()) {
               tmpNode["children"] = getDataFromNodes(node.children);
             }
-
             return tmpNode;
           });
         };
-
         if (includeParent) {
           return getDataFromNodes([this]);
         } else {
@@ -696,11 +621,9 @@ var jqtree = (function (exports) {
         var node = this.getNodeByCallback(function (n) {
           return n.name === name;
         });
-
         if (!node) {
           throw "Node with name ".concat(name, " not found");
         }
-
         return node;
       }
     }, {
@@ -726,14 +649,11 @@ var jqtree = (function (exports) {
           return null;
         } else {
           var _node2 = this.createNode(nodeInfo);
-
           var childIndex = this.parent.getChildIndex(this);
           this.parent.addChildAtPosition(_node2, childIndex + 1);
-
           if (isNodeRecordWithChildren(nodeInfo) && nodeInfo.children.length) {
             _node2.loadFromData(nodeInfo.children);
           }
-
           return _node2;
         }
       }
@@ -744,14 +664,11 @@ var jqtree = (function (exports) {
           return null;
         } else {
           var _node3 = this.createNode(nodeInfo);
-
           var childIndex = this.parent.getChildIndex(this);
           this.parent.addChildAtPosition(_node3, childIndex);
-
           if (isNodeRecordWithChildren(nodeInfo) && nodeInfo.children.length) {
             _node3.loadFromData(nodeInfo.children);
           }
-
           return _node3;
         }
       }
@@ -762,16 +679,12 @@ var jqtree = (function (exports) {
           return null;
         } else {
           var newParent = this.createNode(nodeInfo);
-
           if (this.tree) {
             newParent.setParent(this.tree);
           }
-
           var originalParent = this.parent;
-
           var _iterator3 = _createForOfIteratorHelper(originalParent.children),
-              _step3;
-
+            _step3;
           try {
             for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
               var child = _step3.value;
@@ -782,7 +695,6 @@ var jqtree = (function (exports) {
           } finally {
             _iterator3.f();
           }
-
           originalParent.children = [];
           originalParent.addChild(newParent);
           return newParent;
@@ -801,11 +713,9 @@ var jqtree = (function (exports) {
       value: function append(nodeInfo) {
         var node = this.createNode(nodeInfo);
         this.addChild(node);
-
         if (isNodeRecordWithChildren(nodeInfo) && nodeInfo.children.length) {
           node.loadFromData(nodeInfo.children);
         }
-
         return node;
       }
     }, {
@@ -813,26 +723,21 @@ var jqtree = (function (exports) {
       value: function prepend(nodeInfo) {
         var node = this.createNode(nodeInfo);
         this.addChildAtPosition(node, 0);
-
         if (isNodeRecordWithChildren(nodeInfo) && nodeInfo.children.length) {
           node.loadFromData(nodeInfo.children);
         }
-
         return node;
       }
     }, {
       key: "isParentOf",
       value: function isParentOf(node) {
         var parent = node.parent;
-
         while (parent) {
           if (parent === this) {
             return true;
           }
-
           parent = parent.parent;
         }
-
         return false;
       }
     }, {
@@ -845,7 +750,6 @@ var jqtree = (function (exports) {
           level += 1;
           node = node.parent;
         }
-
         return level;
       }
     }, {
@@ -871,10 +775,8 @@ var jqtree = (function (exports) {
       key: "removeChildren",
       value: function removeChildren() {
         var _this = this;
-
         this.iterate(function (child) {
           var _this$tree;
-
           (_this$tree = _this.tree) === null || _this$tree === void 0 ? void 0 : _this$tree.removeNodeFromIndex(child);
           return true;
         });
@@ -887,9 +789,8 @@ var jqtree = (function (exports) {
           return null;
         } else {
           var previousIndex = this.parent.getChildIndex(this) - 1;
-
           if (previousIndex >= 0) {
-            return this.parent.children[previousIndex];
+            return this.parent.children[previousIndex] || null;
           } else {
             return null;
           }
@@ -902,9 +803,8 @@ var jqtree = (function (exports) {
           return null;
         } else {
           var nextIndex = this.parent.getChildIndex(this) + 1;
-
           if (nextIndex < this.parent.children.length) {
-            return this.parent.children[nextIndex];
+            return this.parent.children[nextIndex] || null;
           } else {
             return null;
           }
@@ -925,7 +825,6 @@ var jqtree = (function (exports) {
           if (f(node)) {
             result.push(node);
           }
-
           return true;
         });
         return result;
@@ -934,16 +833,30 @@ var jqtree = (function (exports) {
       key: "getNextNode",
       value: function getNextNode() {
         var includeChildren = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : true;
-
-        if (includeChildren && this.hasChildren() && this.is_open) {
+        if (includeChildren && this.hasChildren()) {
+          return this.children[0] || null;
+        } else if (!this.parent) {
+          return null;
+        } else {
+          var nextSibling = this.getNextSibling();
+          if (nextSibling) {
+            return nextSibling;
+          } else {
+            return this.parent.getNextNode(false);
+          }
+        }
+      }
+    }, {
+      key: "getNextVisibleNode",
+      value: function getNextVisibleNode() {
+        if (this.hasChildren() && this.is_open) {
           // First child
-          return this.children[0];
+          return this.children[0] || null;
         } else {
           if (!this.parent) {
             return null;
           } else {
             var nextSibling = this.getNextSibling();
-
             if (nextSibling) {
               // Next sibling
               return nextSibling;
@@ -961,17 +874,30 @@ var jqtree = (function (exports) {
           return null;
         } else {
           var previousSibling = this.getPreviousSibling();
-
-          if (previousSibling) {
-            if (!previousSibling.hasChildren() || !previousSibling.is_open) {
-              // Previous sibling
-              return previousSibling;
-            } else {
-              // Last child of previous sibling
-              return previousSibling.getLastChild();
-            }
+          if (!previousSibling) {
+            return this.getParent();
+          } else if (previousSibling.hasChildren()) {
+            return previousSibling.getLastChild();
           } else {
+            return previousSibling;
+          }
+        }
+      }
+    }, {
+      key: "getPreviousVisibleNode",
+      value: function getPreviousVisibleNode() {
+        if (!this.parent) {
+          return null;
+        } else {
+          var previousSibling = this.getPreviousSibling();
+          if (!previousSibling) {
             return this.getParent();
+          } else if (!previousSibling.hasChildren() || !previousSibling.is_open) {
+            // Previous sibling
+            return previousSibling;
+          } else {
+            // Last child of previous sibling
+            return previousSibling.getLastChild();
           }
         }
       }
@@ -995,40 +921,36 @@ var jqtree = (function (exports) {
           return null;
         } else {
           var lastChild = this.children[this.children.length - 1];
-
+          if (!lastChild) {
+            return null;
+          }
           if (!(lastChild.hasChildren() && lastChild.is_open)) {
             return lastChild;
           } else {
-            return lastChild.getLastChild();
+            return lastChild === null || lastChild === void 0 ? void 0 : lastChild.getLastChild();
           }
         }
-      } // Init Node from data without making it the root of the tree
+      }
 
+      // Init Node from data without making it the root of the tree
     }, {
       key: "initFromData",
       value: function initFromData(data) {
         var _this2 = this;
-
         var addNode = function addNode(nodeData) {
           _this2.setData(nodeData);
-
           if (isNodeRecordWithChildren(nodeData) && nodeData.children.length) {
             addChildren(nodeData.children);
           }
         };
-
         var addChildren = function addChildren(childrenData) {
           var _iterator4 = _createForOfIteratorHelper(childrenData),
-              _step4;
-
+            _step4;
           try {
             for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
               var child = _step4.value;
-
               var _node4 = _this2.createNode();
-
               _node4.initFromData(child);
-
               _this2.addChild(_node4);
             }
           } catch (err) {
@@ -1037,14 +959,12 @@ var jqtree = (function (exports) {
             _iterator4.f();
           }
         };
-
         addNode(data);
       }
     }, {
       key: "setParent",
       value: function setParent(parent) {
         var _this$tree2;
-
         this.parent = parent;
         this.tree = parent.tree;
         (_this$tree2 = this.tree) === null || _this$tree2 === void 0 ? void 0 : _this$tree2.addNodeToIndex(this);
@@ -1053,7 +973,6 @@ var jqtree = (function (exports) {
       key: "doRemoveChild",
       value: function doRemoveChild(node) {
         var _this$tree3;
-
         this.children.splice(this.getChildIndex(node), 1);
         (_this$tree3 = this.tree) === null || _this$tree3 === void 0 ? void 0 : _this$tree3.removeNodeFromIndex(node);
       }
@@ -1061,8 +980,7 @@ var jqtree = (function (exports) {
       key: "getNodeClass",
       value: function getNodeClass() {
         var _this$tree4;
-
-        return this.nodeClass || (this === null || this === void 0 ? void 0 : (_this$tree4 = this.tree) === null || _this$tree4 === void 0 ? void 0 : _this$tree4.nodeClass) || Node;
+        return this.nodeClass || (this === null || this === void 0 || (_this$tree4 = this.tree) === null || _this$tree4 === void 0 ? void 0 : _this$tree4.nodeClass) || Node;
       }
     }, {
       key: "createNode",
@@ -1071,32 +989,21 @@ var jqtree = (function (exports) {
         return new nodeClass(nodeData);
       }
     }]);
-
     return Node;
   }();
 
   var DragAndDropHandler = /*#__PURE__*/function () {
     function DragAndDropHandler(treeWidget) {
       _classCallCheck(this, DragAndDropHandler);
-
       _defineProperty(this, "hitAreas", void 0);
-
       _defineProperty(this, "isDragging", void 0);
-
       _defineProperty(this, "currentItem", void 0);
-
       _defineProperty(this, "hoveredArea", void 0);
-
       _defineProperty(this, "positionInfo", void 0);
-
       _defineProperty(this, "treeWidget", void 0);
-
       _defineProperty(this, "dragElement", void 0);
-
       _defineProperty(this, "previousGhost", void 0);
-
       _defineProperty(this, "openFolderTimer", void 0);
-
       this.treeWidget = treeWidget;
       this.hoveredArea = null;
       this.hitAreas = [];
@@ -1104,28 +1011,22 @@ var jqtree = (function (exports) {
       this.currentItem = null;
       this.positionInfo = null;
     }
-
     _createClass(DragAndDropHandler, [{
       key: "mouseCapture",
       value: function mouseCapture(positionInfo) {
         var $element = jQuery(positionInfo.target);
-
         if (!this.mustCaptureElement($element)) {
           return null;
         }
-
         if (this.treeWidget.options.onIsMoveHandle && !this.treeWidget.options.onIsMoveHandle($element)) {
           return null;
         }
-
         var nodeElement = this.treeWidget._getNodeElement($element);
-
         if (nodeElement && this.treeWidget.options.onCanMove) {
           if (!this.treeWidget.options.onCanMove(nodeElement.node)) {
             nodeElement = null;
           }
         }
-
         this.currentItem = nodeElement;
         return this.currentItem != null;
       }
@@ -1133,11 +1034,9 @@ var jqtree = (function (exports) {
       key: "mouseStart",
       value: function mouseStart(positionInfo) {
         var _this$treeWidget$opti;
-
         if (!this.currentItem || positionInfo.pageX === undefined || positionInfo.pageY === undefined) {
           return false;
         }
-
         this.refresh();
         var offset = jQuery(positionInfo.target).offset();
         var left = offset ? offset.left : 0;
@@ -1155,25 +1054,22 @@ var jqtree = (function (exports) {
         if (!this.currentItem || !this.dragElement || positionInfo.pageX === undefined || positionInfo.pageY === undefined) {
           return false;
         }
-
         this.dragElement.move(positionInfo.pageX, positionInfo.pageY);
         this.positionInfo = positionInfo;
         var area = this.findHoveredArea(positionInfo.pageX, positionInfo.pageY);
-
         if (area && this.canMoveToArea(area)) {
           if (!area.node.isFolder()) {
             this.stopOpenFolderTimer();
           }
-
           if (this.hoveredArea !== area) {
-            this.hoveredArea = area; // If this is a closed folder, start timer to open it
+            this.hoveredArea = area;
 
+            // If this is a closed folder, start timer to open it
             if (this.mustOpenFolderTimer(area)) {
               this.startOpenFolderTimer(area.node);
             } else {
               this.stopOpenFolderTimer();
             }
-
             this.updateDropHint();
           }
         } else {
@@ -1181,13 +1077,11 @@ var jqtree = (function (exports) {
           this.stopOpenFolderTimer();
           this.hoveredArea = area;
         }
-
         if (!area) {
           if (this.treeWidget.options.onDragMove) {
             this.treeWidget.options.onDragMove(this.currentItem.node, positionInfo.originalEvent);
           }
         }
-
         return true;
       }
     }, {
@@ -1199,32 +1093,26 @@ var jqtree = (function (exports) {
         this.removeDropHint();
         this.removeHitAreas();
         var currentItem = this.currentItem;
-
         if (this.currentItem) {
           this.currentItem.$element.removeClass("jqtree-moving");
           this.currentItem = null;
         }
-
         this.isDragging = false;
         this.positionInfo = null;
-
         if (!this.hoveredArea && currentItem) {
           if (this.treeWidget.options.onDragStop) {
             this.treeWidget.options.onDragStop(currentItem.node, positionInfo.originalEvent);
           }
         }
-
         return false;
       }
     }, {
       key: "refresh",
       value: function refresh() {
         this.removeHitAreas();
-
         if (this.currentItem) {
           this.generateHitAreas();
           this.currentItem = this.treeWidget._getNodeElementForNode(this.currentItem.node);
-
           if (this.isDragging) {
             this.currentItem.$element.addClass("jqtree-moving");
           }
@@ -1251,11 +1139,9 @@ var jqtree = (function (exports) {
         if (!this.treeWidget.options.onCanMoveTo) {
           return true;
         }
-
         if (!this.currentItem) {
           return false;
         }
-
         var positionName = getPositionName(area.position);
         return this.treeWidget.options.onCanMoveTo(this.currentItem.node, area.node, positionName);
       }
@@ -1288,18 +1174,17 @@ var jqtree = (function (exports) {
       key: "findHoveredArea",
       value: function findHoveredArea(x, y) {
         var dimensions = this.getTreeDimensions();
-
         if (x < dimensions.left || y < dimensions.top || x > dimensions.right || y > dimensions.bottom) {
           return null;
         }
-
         var low = 0;
         var high = this.hitAreas.length;
-
         while (low < high) {
           var mid = low + high >> 1;
           var area = this.hitAreas[mid];
-
+          if (!area) {
+            return null;
+          }
           if (y < area.top) {
             high = mid;
           } else if (y > area.bottom) {
@@ -1308,7 +1193,6 @@ var jqtree = (function (exports) {
             return area;
           }
         }
-
         return null;
       }
     }, {
@@ -1322,31 +1206,27 @@ var jqtree = (function (exports) {
       value: function updateDropHint() {
         if (!this.hoveredArea) {
           return;
-        } // remove previous drop hint
-
+        }
 
-        this.removeDropHint(); // add new drop hint
+        // remove previous drop hint
+        this.removeDropHint();
 
+        // add new drop hint
         var nodeElement = this.treeWidget._getNodeElementForNode(this.hoveredArea.node);
-
         this.previousGhost = nodeElement.addDropHint(this.hoveredArea.position);
       }
     }, {
       key: "startOpenFolderTimer",
       value: function startOpenFolderTimer(folder) {
         var _this = this;
-
         var openFolder = function openFolder() {
           _this.treeWidget._openNode(folder, _this.treeWidget.options.slide, function () {
             _this.refresh();
-
             _this.updateDropHint();
           });
         };
-
         this.stopOpenFolderTimer();
         var openFolderDelay = this.treeWidget.options.openFolderDelay;
-
         if (openFolderDelay !== false) {
           this.openFolderTimer = window.setTimeout(openFolder, openFolderDelay);
         }
@@ -1363,25 +1243,19 @@ var jqtree = (function (exports) {
       key: "moveItem",
       value: function moveItem(positionInfo) {
         var _this2 = this;
-
         if (this.currentItem && this.hoveredArea && this.hoveredArea.position !== Position.None && this.canMoveToArea(this.hoveredArea)) {
           var movedNode = this.currentItem.node;
           var targetNode = this.hoveredArea.node;
           var position = this.hoveredArea.position;
           var previousParent = movedNode.parent;
-
           if (position === Position.Inside) {
             this.hoveredArea.node.is_open = true;
           }
-
           var doMove = function doMove() {
             _this2.treeWidget.tree.moveNode(movedNode, targetNode, position);
-
             _this2.treeWidget.element.empty();
-
             _this2.treeWidget._refreshElements(null);
           };
-
           var event = this.treeWidget._triggerEvent("tree.move", {
             move_info: {
               moved_node: movedNode,
@@ -1392,7 +1266,6 @@ var jqtree = (function (exports) {
               original_event: positionInfo.originalEvent
             }
           });
-
           if (!event.isDefaultPrevented()) {
             doMove();
           }
@@ -1404,7 +1277,6 @@ var jqtree = (function (exports) {
         // Return the dimensions of the tree. Add a margin to the bottom to allow
         // to drag-and-drop after the last element.
         var offset = this.treeWidget.element.offset();
-
         if (!offset) {
           return {
             left: 0,
@@ -1416,9 +1288,7 @@ var jqtree = (function (exports) {
           var el = this.treeWidget.element;
           var width = el.width() || 0;
           var height = el.height() || 0;
-
           var left = offset.left + this.treeWidget._getScrollLeft();
-
           return {
             left: left,
             top: offset.top,
@@ -1428,43 +1298,31 @@ var jqtree = (function (exports) {
         }
       }
     }]);
-
     return DragAndDropHandler;
   }();
-
   var VisibleNodeIterator = /*#__PURE__*/function () {
     function VisibleNodeIterator(tree) {
       _classCallCheck(this, VisibleNodeIterator);
-
       _defineProperty(this, "tree", void 0);
-
       this.tree = tree;
     }
-
     _createClass(VisibleNodeIterator, [{
       key: "iterate",
       value: function iterate() {
         var _this3 = this;
-
         var isFirstNode = true;
-
         var _iterateNode = function _iterateNode(node, nextNode) {
           var mustIterateInside = (node.is_open || !node.element) && node.hasChildren();
           var $element = null;
-
           if (node.element) {
             $element = jQuery(node.element);
-
             if (!$element.is(":visible")) {
               return;
             }
-
             if (isFirstNode) {
               _this3.handleFirstNode(node);
-
               isFirstNode = false;
             }
-
             if (!node.hasChildren()) {
               _this3.handleNode(node, nextNode, $element);
             } else if (node.is_open) {
@@ -1475,55 +1333,46 @@ var jqtree = (function (exports) {
               _this3.handleClosedFolder(node, nextNode, $element);
             }
           }
-
           if (mustIterateInside) {
             var childrenLength = node.children.length;
             node.children.forEach(function (_, i) {
-              if (i === childrenLength - 1) {
-                _iterateNode(node.children[i], null);
-              } else {
-                _iterateNode(node.children[i], node.children[i + 1]);
+              var child = node.children[i];
+              if (child) {
+                if (i === childrenLength - 1) {
+                  _iterateNode(child, null);
+                } else {
+                  var nextChild = node.children[i + 1];
+                  if (nextChild) {
+                    _iterateNode(child, nextChild);
+                  }
+                }
               }
             });
-
             if (node.is_open && $element) {
               _this3.handleAfterOpenFolder(node, nextNode);
             }
           }
         };
-
         _iterateNode(this.tree, null);
       }
     }]);
-
     return VisibleNodeIterator;
   }();
-
   var HitAreasGenerator = /*#__PURE__*/function (_VisibleNodeIterator) {
     _inherits(HitAreasGenerator, _VisibleNodeIterator);
-
     var _super = _createSuper(HitAreasGenerator);
-
     function HitAreasGenerator(tree, currentNode, treeBottom) {
       var _this4;
-
       _classCallCheck(this, HitAreasGenerator);
-
       _this4 = _super.call(this, tree);
-
       _defineProperty(_assertThisInitialized(_this4), "currentNode", void 0);
-
       _defineProperty(_assertThisInitialized(_this4), "treeBottom", void 0);
-
       _defineProperty(_assertThisInitialized(_this4), "positions", void 0);
-
       _defineProperty(_assertThisInitialized(_this4), "lastTop", void 0);
-
       _this4.currentNode = currentNode;
       _this4.treeBottom = treeBottom;
       return _this4;
     }
-
     _createClass(HitAreasGenerator, [{
       key: "generate",
       value: function generate() {
@@ -1538,23 +1387,18 @@ var jqtree = (function (exports) {
         var previousTop = -1;
         var group = [];
         var hitAreas = [];
-
         var _iterator = _createForOfIteratorHelper(positions),
-            _step;
-
+          _step;
         try {
           for (_iterator.s(); !(_step = _iterator.n()).done;) {
             var position = _step.value;
-
             if (position.top !== previousTop && group.length) {
               if (group.length) {
                 this.generateHitAreasForGroup(hitAreas, group, previousTop, position.top);
               }
-
               previousTop = position.top;
               group = [];
             }
-
             group.push(position);
           }
         } catch (err) {
@@ -1562,7 +1406,6 @@ var jqtree = (function (exports) {
         } finally {
           _iterator.f();
         }
-
         this.generateHitAreasForGroup(hitAreas, group, previousTop, this.treeBottom);
         return hitAreas;
       }
@@ -1573,27 +1416,27 @@ var jqtree = (function (exports) {
           // Cannot move inside current item
           // Stop iterating
           return false;
-        } // Cannot move before current item
-
+        }
 
+        // Cannot move before current item
         if (node.children[0] !== this.currentNode) {
           this.addPosition(node, Position.Inside, this.getTop($element));
-        } // Continue iterating
-
+        }
 
+        // Continue iterating
         return true;
       }
     }, {
       key: "handleClosedFolder",
       value: function handleClosedFolder(node, nextNode, $element) {
         var top = this.getTop($element);
-
         if (node === this.currentNode) {
           // Cannot move after current item
           this.addPosition(node, Position.None, top);
         } else {
-          this.addPosition(node, Position.Inside, top); // Cannot move before current item
+          this.addPosition(node, Position.Inside, top);
 
+          // Cannot move before current item
           if (nextNode !== this.currentNode) {
             this.addPosition(node, Position.After, top);
           }
@@ -1620,14 +1463,12 @@ var jqtree = (function (exports) {
       key: "handleNode",
       value: function handleNode(node, nextNode, $element) {
         var top = this.getTop($element);
-
         if (node === this.currentNode) {
           // Cannot move inside current item
           this.addPosition(node, Position.None, top);
         } else {
           this.addPosition(node, Position.Inside, top);
         }
-
         if (nextNode === this.currentNode || node === this.currentNode) {
           // Cannot move before or after current item
           this.addPosition(node, Position.None, top);
@@ -1661,48 +1502,40 @@ var jqtree = (function (exports) {
         var areaHeight = Math.round((bottom - top) / positionCount);
         var areaTop = top;
         var i = 0;
-
         while (i < positionCount) {
           var position = positionsInGroup[i];
-          hitAreas.push({
-            top: areaTop,
-            bottom: areaTop + areaHeight,
-            node: position.node,
-            position: position.position
-          });
+          if (position) {
+            hitAreas.push({
+              top: areaTop,
+              bottom: areaTop + areaHeight,
+              node: position.node,
+              position: position.position
+            });
+          }
           areaTop += areaHeight;
           i += 1;
         }
       }
     }]);
-
     return HitAreasGenerator;
   }(VisibleNodeIterator);
-
   var DragElement = /*#__PURE__*/function () {
     function DragElement(nodeName, offsetX, offsetY, $tree, autoEscape) {
       _classCallCheck(this, DragElement);
-
       _defineProperty(this, "offsetX", void 0);
-
       _defineProperty(this, "offsetY", void 0);
-
       _defineProperty(this, "$element", void 0);
-
       this.offsetX = offsetX;
       this.offsetY = offsetY;
       this.$element = jQuery("<span>").addClass("jqtree-title jqtree-dragging");
-
       if (autoEscape) {
         this.$element.text(nodeName);
       } else {
         this.$element.html(nodeName);
       }
-
       this.$element.css("position", "absolute");
       $tree.append(this.$element);
     }
-
     _createClass(DragElement, [{
       key: "move",
       value: function move(pageX, pageY) {
@@ -1717,7 +1550,6 @@ var jqtree = (function (exports) {
         this.$element.remove();
       }
     }]);
-
     return DragElement;
   }();
 
@@ -1734,18 +1566,13 @@ var jqtree = (function (exports) {
   var ElementsRenderer = /*#__PURE__*/function () {
     function ElementsRenderer(treeWidget) {
       _classCallCheck(this, ElementsRenderer);
-
       _defineProperty(this, "openedIconElement", void 0);
-
       _defineProperty(this, "closedIconElement", void 0);
-
       _defineProperty(this, "treeWidget", void 0);
-
       this.treeWidget = treeWidget;
       this.openedIconElement = this.createButtonElement(treeWidget.options.openedIcon || "+");
       this.closedIconElement = this.createButtonElement(treeWidget.options.closedIcon || "-");
     }
-
     _createClass(ElementsRenderer, [{
       key: "render",
       value: function render(fromNode) {
@@ -1760,21 +1587,27 @@ var jqtree = (function (exports) {
       value: function renderFromRoot() {
         var $element = this.treeWidget.element;
         $element.empty();
-        this.createDomElements($element[0], this.treeWidget.tree.children, true, 1);
+        if ($element[0]) {
+          this.createDomElements($element[0], this.treeWidget.tree.children, true, 1);
+        }
       }
     }, {
       key: "renderFromNode",
       value: function renderFromNode(node) {
         // remember current li
-        var $previousLi = jQuery(node.element); // create element
+        var $previousLi = jQuery(node.element);
 
+        // create element
         var li = this.createLi(node, node.getLevel());
-        this.attachNodeData(node, li); // add element to dom
+        this.attachNodeData(node, li);
 
-        $previousLi.after(li); // remove previous li
+        // add element to dom
+        $previousLi.after(li);
 
-        $previousLi.remove(); // create children
+        // remove previous li
+        $previousLi.remove();
 
+        // create children
         if (node.children) {
           this.createDomElements(li, node.children, false, node.getLevel() + 1);
         }
@@ -1784,17 +1617,14 @@ var jqtree = (function (exports) {
       value: function createDomElements(element, children, isRootNode, level) {
         var ul = this.createUl(isRootNode);
         element.appendChild(ul);
-
         var _iterator = _createForOfIteratorHelper(children),
-            _step;
-
+          _step;
         try {
           for (_iterator.s(); !(_step = _iterator.n()).done;) {
             var child = _step.value;
             var li = this.createLi(child, level);
             ul.appendChild(li);
             this.attachNodeData(child, li);
-
             if (child.hasChildren()) {
               this.createDomElements(li, child.children, false, level + 1);
             }
@@ -1816,23 +1646,19 @@ var jqtree = (function (exports) {
       value: function createUl(isRootNode) {
         var classString;
         var role;
-
         if (!isRootNode) {
           classString = "";
           role = "group";
         } else {
           classString = "jqtree-tree";
           role = "tree";
-
           if (this.treeWidget.options.rtl) {
             classString += " jqtree-rtl";
           }
         }
-
         if (this.treeWidget.options.dragAndDrop) {
           classString += " jqtree-dnd";
         }
-
         var ul = document.createElement("ul");
         ul.className = "jqtree_common ".concat(classString);
         ul.setAttribute("role", role);
@@ -1844,138 +1670,132 @@ var jqtree = (function (exports) {
         var isSelected = Boolean(this.treeWidget.selectNodeHandler.isNodeSelected(node));
         var mustShowFolder = node.isFolder() || node.isEmptyFolder && this.treeWidget.options.showEmptyFolder;
         var li = mustShowFolder ? this.createFolderLi(node, level, isSelected) : this.createNodeLi(node, level, isSelected);
-
         if (this.treeWidget.options.onCreateLi) {
           this.treeWidget.options.onCreateLi(node, jQuery(li), isSelected);
         }
-
         return li;
       }
+    }, {
+      key: "setTreeItemAriaAttributes",
+      value: function setTreeItemAriaAttributes(element, name, level, isSelected) {
+        element.setAttribute("aria-label", name);
+        element.setAttribute("aria-level", "".concat(level));
+        element.setAttribute("aria-selected", getBoolString(isSelected));
+        element.setAttribute("role", "treeitem");
+      }
     }, {
       key: "createFolderLi",
       value: function createFolderLi(node, level, isSelected) {
         var buttonClasses = this.getButtonClasses(node);
         var folderClasses = this.getFolderClasses(node, isSelected);
-        var iconElement = node.is_open ? this.openedIconElement : this.closedIconElement; // li
+        var iconElement = node.is_open ? this.openedIconElement : this.closedIconElement;
 
+        // li
         var li = document.createElement("li");
         li.className = "jqtree_common ".concat(folderClasses);
-        li.setAttribute("role", "presentation"); // div
+        li.setAttribute("role", "none");
 
+        // div
         var div = document.createElement("div");
         div.className = "jqtree-element jqtree_common";
-        div.setAttribute("role", "presentation");
-        li.appendChild(div); // button link
+        div.setAttribute("role", "none");
+        li.appendChild(div);
 
+        // button link
         var buttonLink = document.createElement("a");
         buttonLink.className = buttonClasses;
-        buttonLink.appendChild(iconElement.cloneNode(true));
-        buttonLink.setAttribute("role", "presentation");
-        buttonLink.setAttribute("aria-hidden", "true");
-
+        if (iconElement) {
+          buttonLink.appendChild(iconElement.cloneNode(true));
+        }
         if (this.treeWidget.options.buttonLeft) {
           div.appendChild(buttonLink);
-        } // title span
-
-
-        div.appendChild(this.createTitleSpan(node.name, level, isSelected, node.is_open, true));
+        }
 
+        // title span
+        var titleSpan = this.createTitleSpan(node.name, isSelected, true, level);
+        titleSpan.setAttribute("aria-expanded", getBoolString(node.is_open));
+        div.appendChild(titleSpan);
         if (!this.treeWidget.options.buttonLeft) {
           div.appendChild(buttonLink);
         }
-
         return li;
       }
     }, {
       key: "createNodeLi",
       value: function createNodeLi(node, level, isSelected) {
         var liClasses = ["jqtree_common"];
-
         if (isSelected) {
           liClasses.push("jqtree-selected");
         }
+        var classString = liClasses.join(" ");
 
-        var classString = liClasses.join(" "); // li
-
+        // li
         var li = document.createElement("li");
         li.className = classString;
-        li.setAttribute("role", "presentation"); // div
+        li.setAttribute("role", "none");
 
+        // div
         var div = document.createElement("div");
         div.className = "jqtree-element jqtree_common";
-        div.setAttribute("role", "presentation");
-        li.appendChild(div); // title span
+        div.setAttribute("role", "none");
+        li.appendChild(div);
 
-        div.appendChild(this.createTitleSpan(node.name, level, isSelected, node.is_open, false));
+        // title span
+        var titleSpan = this.createTitleSpan(node.name, isSelected, false, level);
+        div.appendChild(titleSpan);
         return li;
       }
     }, {
       key: "createTitleSpan",
-      value: function createTitleSpan(nodeName, level, isSelected, isOpen, isFolder) {
+      value: function createTitleSpan(nodeName, isSelected, isFolder, level) {
         var titleSpan = document.createElement("span");
         var classes = "jqtree-title jqtree_common";
-
         if (isFolder) {
           classes += " jqtree-title-folder";
         }
-
         classes += " jqtree-title-button-".concat(this.treeWidget.options.buttonLeft ? "left" : "right");
         titleSpan.className = classes;
-        titleSpan.setAttribute("role", "treeitem");
-        titleSpan.setAttribute("aria-level", "".concat(level));
-        titleSpan.setAttribute("aria-selected", getBoolString(isSelected));
-        titleSpan.setAttribute("aria-expanded", getBoolString(isOpen));
-
         if (isSelected) {
           var tabIndex = this.treeWidget.options.tabIndex;
-
           if (tabIndex !== undefined) {
             titleSpan.setAttribute("tabindex", "".concat(tabIndex));
           }
         }
-
+        this.setTreeItemAriaAttributes(titleSpan, nodeName, level, isSelected);
         if (this.treeWidget.options.autoEscape) {
           titleSpan.textContent = nodeName;
         } else {
           titleSpan.innerHTML = nodeName;
         }
-
         return titleSpan;
       }
     }, {
       key: "getButtonClasses",
       value: function getButtonClasses(node) {
         var classes = ["jqtree-toggler", "jqtree_common"];
-
         if (!node.is_open) {
           classes.push("jqtree-closed");
         }
-
         if (this.treeWidget.options.buttonLeft) {
           classes.push("jqtree-toggler-left");
         } else {
           classes.push("jqtree-toggler-right");
         }
-
         return classes.join(" ");
       }
     }, {
       key: "getFolderClasses",
       value: function getFolderClasses(node, isSelected) {
         var classes = ["jqtree-folder"];
-
         if (!node.is_open) {
           classes.push("jqtree-closed");
         }
-
         if (isSelected) {
           classes.push("jqtree-selected");
         }
-
         if (node.is_loading) {
           classes.push("jqtree-loading");
         }
-
         return classes.join(" ");
       }
     }, {
@@ -1991,56 +1811,42 @@ var jqtree = (function (exports) {
         }
       }
     }]);
-
     return ElementsRenderer;
   }();
 
   var DataLoader = /*#__PURE__*/function () {
     function DataLoader(treeWidget) {
       _classCallCheck(this, DataLoader);
-
       _defineProperty(this, "treeWidget", void 0);
-
       this.treeWidget = treeWidget;
     }
-
     _createClass(DataLoader, [{
       key: "loadFromUrl",
       value: function loadFromUrl(urlInfo, parentNode, onFinished) {
         var _this = this;
-
         if (!urlInfo) {
           return;
         }
-
         var $el = this.getDomElement(parentNode);
         this.addLoadingClass($el);
         this.notifyLoading(true, parentNode, $el);
-
         var stopLoading = function stopLoading() {
           _this.removeLoadingClass($el);
-
           _this.notifyLoading(false, parentNode, $el);
         };
-
         var handleSuccess = function handleSuccess(data) {
           stopLoading();
-
           _this.treeWidget.loadData(_this.parseData(data), parentNode);
-
           if (onFinished && typeof onFinished === "function") {
             onFinished();
           }
         };
-
         var handleError = function handleError(jqXHR) {
           stopLoading();
-
           if (_this.treeWidget.options.onLoadFailed) {
             _this.treeWidget.options.onLoadFailed(jqXHR);
           }
         };
-
         this.submitRequest(urlInfo, handleSuccess, handleError);
       }
     }, {
@@ -2072,7 +1878,6 @@ var jqtree = (function (exports) {
         if (this.treeWidget.options.onLoading) {
           this.treeWidget.options.onLoading(isLoading, node, $el);
         }
-
         this.treeWidget._triggerEvent("tree.loading_data", {
           isLoading: isLoading,
           node: node,
@@ -2083,11 +1888,9 @@ var jqtree = (function (exports) {
       key: "submitRequest",
       value: function submitRequest(urlInfoInput, handleSuccess, handleError) {
         var _ajaxSettings$method;
-
         var urlInfo = typeof urlInfoInput === "string" ? {
           url: urlInfoInput
         } : urlInfoInput;
-
         var ajaxSettings = _objectSpread2({
           method: "GET",
           cache: false,
@@ -2095,7 +1898,6 @@ var jqtree = (function (exports) {
           success: handleSuccess,
           error: handleError
         }, urlInfo);
-
         ajaxSettings.method = ((_ajaxSettings$method = ajaxSettings.method) === null || _ajaxSettings$method === void 0 ? void 0 : _ajaxSettings$method.toUpperCase()) || "GET";
         void jQuery.ajax(ajaxSettings);
       }
@@ -2103,7 +1905,6 @@ var jqtree = (function (exports) {
       key: "parseData",
       value: function parseData(data) {
         var dataFilter = this.treeWidget.options.dataFilter;
-
         var getParsedData = function getParsedData() {
           if (typeof data === "string") {
             return JSON.parse(data);
@@ -2111,9 +1912,7 @@ var jqtree = (function (exports) {
             return data;
           }
         };
-
         var parsedData = getParsedData();
-
         if (dataFilter) {
           return dataFilter(parsedData);
         } else {
@@ -2121,56 +1920,41 @@ var jqtree = (function (exports) {
         }
       }
     }]);
-
     return DataLoader;
   }();
 
   var KeyHandler = /*#__PURE__*/function () {
     function KeyHandler(treeWidget) {
       var _this = this;
-
       _classCallCheck(this, KeyHandler);
-
       _defineProperty(this, "treeWidget", void 0);
-
       _defineProperty(this, "handleKeyDown", function (e) {
         if (!_this.canHandleKeyboard()) {
           return true;
         }
-
         var selectedNode = _this.treeWidget.getSelectedNode();
-
         if (!selectedNode) {
           return true;
         }
-
         var key = e.which;
-
         switch (key) {
           case KeyHandler.DOWN:
             return _this.moveDown(selectedNode);
-
           case KeyHandler.UP:
             return _this.moveUp(selectedNode);
-
           case KeyHandler.RIGHT:
             return _this.moveRight(selectedNode);
-
           case KeyHandler.LEFT:
             return _this.moveLeft(selectedNode);
-
           default:
             return true;
         }
       });
-
       this.treeWidget = treeWidget;
-
       if (treeWidget.options.keyboardSupport) {
         jQuery(document).on("keydown.jqtree", this.handleKeyDown);
       }
     }
-
     _createClass(KeyHandler, [{
       key: "deinit",
       value: function deinit() {
@@ -2179,12 +1963,12 @@ var jqtree = (function (exports) {
     }, {
       key: "moveDown",
       value: function moveDown(selectedNode) {
-        return this.selectNode(selectedNode.getNextNode());
+        return this.selectNode(selectedNode.getNextVisibleNode());
       }
     }, {
       key: "moveUp",
       value: function moveUp(selectedNode) {
-        return this.selectNode(selectedNode.getPreviousNode());
+        return this.selectNode(selectedNode.getPreviousVisibleNode());
       }
     }, {
       key: "moveRight",
@@ -2195,7 +1979,7 @@ var jqtree = (function (exports) {
           // folder node
           if (selectedNode.is_open) {
             // Right moves to the first child of an open node
-            return this.selectNode(selectedNode.getNextNode());
+            return this.selectNode(selectedNode.getNextVisibleNode());
           } else {
             // Right expands a closed node
             this.treeWidget.openNode(selectedNode);
@@ -2222,11 +2006,9 @@ var jqtree = (function (exports) {
           return true;
         } else {
           this.treeWidget.selectNode(node);
-
           if (!this.treeWidget.scrollHandler.isScrolledIntoView(jQuery(node.element).find(".jqtree-element"))) {
             this.treeWidget.scrollToNode(node);
           }
-
           return false;
         }
       }
@@ -2236,53 +2018,41 @@ var jqtree = (function (exports) {
         return (this.treeWidget.options.keyboardSupport || false) && this.treeWidget.selectNodeHandler.isFocusOnTree();
       }
     }]);
-
     return KeyHandler;
   }();
-
   _defineProperty(KeyHandler, "LEFT", 37);
-
   _defineProperty(KeyHandler, "UP", 38);
-
   _defineProperty(KeyHandler, "RIGHT", 39);
-
   _defineProperty(KeyHandler, "DOWN", 40);
 
   var _register = function register(widgetClass, widgetName) {
     var getDataKey = function getDataKey() {
       return "simple_widget_".concat(widgetName);
     };
-
     var getWidgetData = function getWidgetData(el, dataKey) {
       var widget = jQuery.data(el, dataKey);
-
       if (widget && widget instanceof SimpleWidget) {
         return widget;
       } else {
         return null;
       }
     };
-
     var createWidget = function createWidget($el, options) {
       var dataKey = getDataKey();
-
       var _iterator = _createForOfIteratorHelper($el.get()),
-          _step;
-
+        _step;
       try {
         for (_iterator.s(); !(_step = _iterator.n()).done;) {
           var el = _step.value;
           var existingWidget = getWidgetData(el, dataKey);
-
           if (!existingWidget) {
             var simpleWidgetClass = widgetClass;
             var widget = new simpleWidgetClass(el, options);
-
             if (!jQuery.data(el, dataKey)) {
               jQuery.data(el, dataKey, widget);
-            } // Call init after setting data, so we can call methods
-
+            }
 
+            // Call init after setting data, so we can call methods
             widget.init();
           }
         }
@@ -2291,25 +2061,19 @@ var jqtree = (function (exports) {
       } finally {
         _iterator.f();
       }
-
       return $el;
     };
-
     var destroyWidget = function destroyWidget($el) {
       var dataKey = getDataKey();
-
       var _iterator2 = _createForOfIteratorHelper($el.get()),
-          _step2;
-
+        _step2;
       try {
         for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
           var el = _step2.value;
           var widget = getWidgetData(el, dataKey);
-
           if (widget) {
             widget.destroy();
           }
-
           jQuery.removeData(el, dataKey);
         }
       } catch (err) {
@@ -2318,22 +2082,17 @@ var jqtree = (function (exports) {
         _iterator2.f();
       }
     };
-
     var callFunction = function callFunction($el, functionName, args) {
       var result = null;
-
       var _iterator3 = _createForOfIteratorHelper($el.get()),
-          _step3;
-
+        _step3;
       try {
         for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
           var el = _step3.value;
           var widget = jQuery.data(el, getDataKey());
-
           if (widget && widget instanceof SimpleWidget) {
             var simpleWidget = widget;
             var widgetFunction = simpleWidget[functionName];
-
             if (widgetFunction && typeof widgetFunction === "function") {
               result = widgetFunction.apply(widget, args);
             }
@@ -2344,11 +2103,10 @@ var jqtree = (function (exports) {
       } finally {
         _iterator3.f();
       }
-
       return result;
-    }; // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
-
+    };
 
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
     jQuery.fn[widgetName] = function (argument1) {
       if (!argument1) {
         return createWidget(this, null);
@@ -2357,7 +2115,6 @@ var jqtree = (function (exports) {
         return createWidget(this, options);
       } else if (typeof argument1 === "string" && argument1[0] !== "_") {
         var functionName = argument1;
-
         if (functionName === "destroy") {
           return destroyWidget(this);
         } else if (functionName === "get_widget_class") {
@@ -2366,27 +2123,24 @@ var jqtree = (function (exports) {
           for (var _len = arguments.length, args = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
             args[_key - 1] = arguments[_key];
           }
-
           return callFunction(this, functionName, args);
         }
+      } else {
+        return undefined;
       }
     };
   };
-
   var SimpleWidget = /*#__PURE__*/function () {
     function SimpleWidget(el, options) {
       _classCallCheck(this, SimpleWidget);
-
       _defineProperty(this, "options", void 0);
-
       _defineProperty(this, "$el", void 0);
+      this.$el = jQuery(el);
 
-      this.$el = jQuery(el); // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
-
+      // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
       var defaults = this.constructor["defaults"];
       this.options = _objectSpread2(_objectSpread2({}, defaults), options);
     }
-
     _createClass(SimpleWidget, [{
       key: "destroy",
       value: function destroy() {
@@ -2394,11 +2148,13 @@ var jqtree = (function (exports) {
       }
     }, {
       key: "init",
-      value: function init() {//
+      value: function init() {
+        //
       }
     }, {
       key: "deinit",
-      value: function deinit() {//
+      value: function deinit() {
+        //
       }
     }], [{
       key: "register",
@@ -2406,10 +2162,8 @@ var jqtree = (function (exports) {
         _register(widgetClass, widgetName);
       }
     }]);
-
     return SimpleWidget;
   }();
-
   _defineProperty(SimpleWidget, "defaults", {});
 
   var getPositionInfoFromMouseEvent = function getPositionInfoFromMouseEvent(e) {
@@ -2420,7 +2174,6 @@ var jqtree = (function (exports) {
       originalEvent: e
     };
   };
-
   var getPositionInfoFromTouch = function getPositionInfoFromTouch(touch, e) {
     return {
       pageX: touch.pageX,
@@ -2429,102 +2182,81 @@ var jqtree = (function (exports) {
       originalEvent: e
     };
   };
-
   var MouseWidget = /*#__PURE__*/function (_SimpleWidget) {
     _inherits(MouseWidget, _SimpleWidget);
-
     var _super = _createSuper(MouseWidget);
-
     function MouseWidget() {
       var _this;
-
       _classCallCheck(this, MouseWidget);
-
       for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
         args[_key] = arguments[_key];
       }
-
       _this = _super.call.apply(_super, [this].concat(args));
-
       _defineProperty(_assertThisInitialized(_this), "isMouseStarted", void 0);
-
       _defineProperty(_assertThisInitialized(_this), "mouseDownInfo", void 0);
-
       _defineProperty(_assertThisInitialized(_this), "mouseDelayTimer", void 0);
-
       _defineProperty(_assertThisInitialized(_this), "isMouseDelayMet", void 0);
-
       _defineProperty(_assertThisInitialized(_this), "mouseDown", function (e) {
         // Left mouse button?
         if (e.button !== 0) {
           return;
         }
-
         var result = _this.handleMouseDown(getPositionInfoFromMouseEvent(e));
-
         if (result && e.cancelable) {
           e.preventDefault();
         }
       });
-
       _defineProperty(_assertThisInitialized(_this), "mouseMove", function (e) {
         _this.handleMouseMove(e, getPositionInfoFromMouseEvent(e));
       });
-
       _defineProperty(_assertThisInitialized(_this), "mouseUp", function (e) {
         _this.handleMouseUp(getPositionInfoFromMouseEvent(e));
       });
-
       _defineProperty(_assertThisInitialized(_this), "touchStart", function (e) {
         if (!e) {
           return;
         }
-
         if (e.touches.length > 1) {
           return;
         }
-
         var touch = e.changedTouches[0];
-
+        if (!touch) {
+          return;
+        }
         _this.handleMouseDown(getPositionInfoFromTouch(touch, e));
       });
-
       _defineProperty(_assertThisInitialized(_this), "touchMove", function (e) {
         if (!e) {
           return;
         }
-
         if (e.touches.length > 1) {
           return;
         }
-
         var touch = e.changedTouches[0];
-
+        if (!touch) {
+          return;
+        }
         _this.handleMouseMove(e, getPositionInfoFromTouch(touch, e));
       });
-
       _defineProperty(_assertThisInitialized(_this), "touchEnd", function (e) {
         if (!e) {
           return;
         }
-
         if (e.touches.length > 1) {
           return;
         }
-
         var touch = e.changedTouches[0];
-
+        if (!touch) {
+          return;
+        }
         _this.handleMouseUp(getPositionInfoFromTouch(touch, e));
       });
-
       return _this;
     }
-
     _createClass(MouseWidget, [{
       key: "init",
       value: function init() {
         var element = this.$el.get(0);
-
         if (element) {
           element.addEventListener("mousedown", this.mouseDown, {
             passive: false
@@ -2533,7 +2265,6 @@ var jqtree = (function (exports) {
             passive: false
           });
         }
-
         this.isMouseStarted = false;
         this.mouseDelayTimer = null;
         this.isMouseDelayMet = false;
@@ -2543,18 +2274,17 @@ var jqtree = (function (exports) {
       key: "deinit",
       value: function deinit() {
         var el = this.$el.get(0);
-
         if (el) {
           // eslint-disable-next-line @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unsafe-member-access
           el.removeEventListener("mousedown", this.mouseDown, {
             passive: false
-          }); // eslint-disable-next-line @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unsafe-member-access
+          });
 
+          // eslint-disable-next-line @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unsafe-member-access
           el.removeEventListener("touchstart", this.touchStart, {
             passive: false
           });
         }
-
         this.removeMouseMoveEventListeners();
       }
     }, {
@@ -2564,13 +2294,10 @@ var jqtree = (function (exports) {
         if (this.isMouseStarted) {
           this.handleMouseUp(positionInfo);
         }
-
         this.mouseDownInfo = positionInfo;
-
         if (!this.mouseCapture(positionInfo)) {
           return false;
         }
-
         this.handleStartMouse();
         return true;
       }
@@ -2590,7 +2317,6 @@ var jqtree = (function (exports) {
           passive: false
         });
         var mouseDelay = this.getMouseDelay();
-
         if (mouseDelay) {
           this.startMouseDelayTimer(mouseDelay);
         } else {
@@ -2601,11 +2327,9 @@ var jqtree = (function (exports) {
       key: "startMouseDelayTimer",
       value: function startMouseDelayTimer(mouseDelay) {
         var _this2 = this;
-
         if (this.mouseDelayTimer) {
           clearTimeout(this.mouseDelayTimer);
         }
-
         this.mouseDelayTimer = window.setTimeout(function () {
           if (_this2.mouseDownInfo) {
             _this2.isMouseDelayMet = true;
@@ -2618,25 +2342,19 @@ var jqtree = (function (exports) {
       value: function handleMouseMove(e, positionInfo) {
         if (this.isMouseStarted) {
           this.mouseDrag(positionInfo);
-
           if (e.cancelable) {
             e.preventDefault();
           }
-
           return;
         }
-
         if (!this.isMouseDelayMet) {
           return;
         }
-
         if (this.mouseDownInfo) {
           this.isMouseStarted = this.mouseStart(this.mouseDownInfo) !== false;
         }
-
         if (this.isMouseStarted) {
           this.mouseDrag(positionInfo);
-
           if (e.cancelable) {
             e.preventDefault();
           }
@@ -2650,7 +2368,6 @@ var jqtree = (function (exports) {
         this.removeMouseMoveEventListeners();
         this.isMouseDelayMet = false;
         this.mouseDownInfo = null;
-
         if (this.isMouseStarted) {
           this.isMouseStarted = false;
           this.mouseStop(positionInfo);
@@ -2662,41 +2379,35 @@ var jqtree = (function (exports) {
         // eslint-disable-next-line @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unsafe-member-access
         document.removeEventListener("mousemove", this.mouseMove, {
           passive: false
-        }); // eslint-disable-next-line @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unsafe-member-access
-
+        });
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unsafe-member-access
         document.removeEventListener("touchmove", this.touchMove, {
           passive: false
-        }); // eslint-disable-next-line @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unsafe-member-access
-
+        });
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unsafe-member-access
         document.removeEventListener("mouseup", this.mouseUp, {
           passive: false
-        }); // eslint-disable-next-line @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unsafe-member-access
-
+        });
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unsafe-member-access
         document.removeEventListener("touchend", this.touchEnd, {
           passive: false
         });
       }
     }]);
-
     return MouseWidget;
   }(SimpleWidget);
 
   var SaveStateHandler = /*#__PURE__*/function () {
     function SaveStateHandler(treeWidget) {
       _classCallCheck(this, SaveStateHandler);
-
       _defineProperty(this, "treeWidget", void 0);
-
       _defineProperty(this, "_supportsLocalStorage", void 0);
-
       this.treeWidget = treeWidget;
     }
-
     _createClass(SaveStateHandler, [{
       key: "saveState",
       value: function saveState() {
         var state = JSON.stringify(this.getState());
-
         if (this.treeWidget.options.onSetStateFromStorage) {
           this.treeWidget.options.onSetStateFromStorage(state);
         } else if (this.supportsLocalStorage()) {
@@ -2707,7 +2418,6 @@ var jqtree = (function (exports) {
       key: "getStateFromStorage",
       value: function getStateFromStorage() {
         var jsonData = this.loadFromStorage();
-
         if (jsonData) {
           return this.parseState(jsonData);
         } else {
@@ -2718,44 +2428,36 @@ var jqtree = (function (exports) {
       key: "getState",
       value: function getState() {
         var _this = this;
-
         var getOpenNodeIds = function getOpenNodeIds() {
           var openNodes = [];
-
           _this.treeWidget.tree.iterate(function (node) {
             if (node.is_open && node.id && node.hasChildren()) {
               openNodes.push(node.id);
             }
-
             return true;
           });
-
           return openNodes;
         };
-
         var getSelectedNodeIds = function getSelectedNodeIds() {
           var selectedNodeIds = [];
-
           _this.treeWidget.getSelectedNodes().forEach(function (node) {
             if (node.id != null) {
               selectedNodeIds.push(node.id);
             }
           });
-
           return selectedNodeIds;
         };
-
         return {
           open_nodes: getOpenNodeIds(),
           selected_node: getSelectedNodeIds()
         };
       }
+
       /*
       Set initial state
       Don't handle nodes that are loaded on demand
        result: must load on demand
       */
-
     }, {
       key: "setInitialState",
       value: function setInitialState(state) {
@@ -2763,16 +2465,13 @@ var jqtree = (function (exports) {
           return false;
         } else {
           var mustLoadOnDemand = false;
-
           if (state.open_nodes) {
             mustLoadOnDemand = this.openInitialNodes(state.open_nodes);
           }
-
           if (state.selected_node) {
             this.resetSelection();
             this.selectInitialNodes(state.selected_node);
           }
-
           return mustLoadOnDemand;
         }
       }
@@ -2789,9 +2488,8 @@ var jqtree = (function (exports) {
       key: "getNodeIdToBeSelected",
       value: function getNodeIdToBeSelected() {
         var state = this.getStateFromStorage();
-
         if (state && state.selected_node) {
-          return state.selected_node[0];
+          return state.selected_node[0] || null;
         } else {
           return null;
         }
@@ -2799,13 +2497,13 @@ var jqtree = (function (exports) {
     }, {
       key: "parseState",
       value: function parseState(jsonData) {
-        var state = JSON.parse(jsonData); // Check if selected_node is an int (instead of an array)
+        var state = JSON.parse(jsonData);
 
+        // Check if selected_node is an int (instead of an array)
         if (state && state.selected_node && isInt(state.selected_node)) {
           // Convert to array
           state.selected_node = [state.selected_node];
         }
-
         return state;
       }
     }, {
@@ -2823,15 +2521,12 @@ var jqtree = (function (exports) {
       key: "openInitialNodes",
       value: function openInitialNodes(nodeIds) {
         var mustLoadOnDemand = false;
-
         var _iterator = _createForOfIteratorHelper(nodeIds),
-            _step;
-
+          _step;
         try {
           for (_iterator.s(); !(_step = _iterator.n()).done;) {
             var nodeId = _step.value;
             var node = this.treeWidget.getNodeById(nodeId);
-
             if (node) {
               if (!node.load_on_demand) {
                 node.is_open = true;
@@ -2845,22 +2540,18 @@ var jqtree = (function (exports) {
         } finally {
           _iterator.f();
         }
-
         return mustLoadOnDemand;
       }
     }, {
       key: "selectInitialNodes",
       value: function selectInitialNodes(nodeIds) {
         var selectCount = 0;
-
         var _iterator2 = _createForOfIteratorHelper(nodeIds),
-            _step2;
-
+          _step2;
         try {
           for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
             var nodeId = _step2.value;
             var node = this.treeWidget.getNodeById(nodeId);
-
             if (node) {
               selectCount += 1;
               this.treeWidget.selectNodeHandler.addToSelection(node);
@@ -2871,7 +2562,6 @@ var jqtree = (function (exports) {
         } finally {
           _iterator2.f();
         }
-
         return selectCount !== 0;
       }
     }, {
@@ -2887,22 +2577,16 @@ var jqtree = (function (exports) {
       key: "doSetInitialStateOnDemand",
       value: function doSetInitialStateOnDemand(nodeIdsParam, selectedNodes, cbFinished) {
         var _this2 = this;
-
         var loadingCount = 0;
         var nodeIds = nodeIdsParam;
-
         var openNodes = function openNodes() {
           var newNodesIds = [];
-
           var _iterator3 = _createForOfIteratorHelper(nodeIds),
-              _step3;
-
+            _step3;
           try {
             for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
               var nodeId = _step3.value;
-
               var node = _this2.treeWidget.getNodeById(nodeId);
-
               if (!node) {
                 newNodesIds.push(nodeId);
               } else {
@@ -2920,27 +2604,21 @@ var jqtree = (function (exports) {
           } finally {
             _iterator3.f();
           }
-
           nodeIds = newNodesIds;
-
           if (_this2.selectInitialNodes(selectedNodes)) {
             _this2.treeWidget._refreshElements(null);
           }
-
           if (loadingCount === 0) {
             cbFinished();
           }
         };
-
         var loadAndOpenNode = function loadAndOpenNode(node) {
           loadingCount += 1;
-
           _this2.treeWidget._openNode(node, false, function () {
             loadingCount -= 1;
             openNodes();
           });
         };
-
         openNodes();
       }
     }, {
@@ -2968,41 +2646,30 @@ var jqtree = (function (exports) {
             } catch (error) {
               return false;
             }
-
             return true;
           }
         };
-
         if (this._supportsLocalStorage == null) {
           this._supportsLocalStorage = testSupport();
         }
-
         return this._supportsLocalStorage;
       }
     }]);
-
     return SaveStateHandler;
   }();
 
   var ScrollHandler = /*#__PURE__*/function () {
     function ScrollHandler(treeWidget) {
       _classCallCheck(this, ScrollHandler);
-
       _defineProperty(this, "treeWidget", void 0);
-
       _defineProperty(this, "previousTop", void 0);
-
       _defineProperty(this, "isInitialized", void 0);
-
       _defineProperty(this, "$scrollParent", void 0);
-
       _defineProperty(this, "scrollParentTop", void 0);
-
       this.treeWidget = treeWidget;
       this.previousTop = -1;
       this.isInitialized = false;
     }
-
     _createClass(ScrollHandler, [{
       key: "checkScrolling",
       value: function checkScrolling() {
@@ -3014,8 +2681,7 @@ var jqtree = (function (exports) {
       key: "scrollToY",
       value: function scrollToY(top) {
         this.ensureInit();
-
-        if (this.$scrollParent) {
+        if (this.$scrollParent && this.$scrollParent[0]) {
           this.$scrollParent[0].scrollTop = top;
         } else {
           var offset = this.treeWidget.$el.offset();
@@ -3032,7 +2698,6 @@ var jqtree = (function (exports) {
         var elementTop;
         var viewTop;
         var elHeight = $element.height() || 0;
-
         if (this.$scrollParent) {
           viewTop = 0;
           viewBottom = this.$scrollParent.height() || 0;
@@ -3044,13 +2709,10 @@ var jqtree = (function (exports) {
           viewTop = jQuery(window).scrollTop() || 0;
           var windowHeight = jQuery(window).height() || 0;
           viewBottom = viewTop + windowHeight;
-
           var _offset = $element.offset();
-
           elementTop = _offset ? _offset.top : 0;
           elementBottom = elementTop + elHeight;
         }
-
         return elementBottom <= viewBottom && elementTop >= viewTop;
       }
     }, {
@@ -3065,77 +2727,55 @@ var jqtree = (function (exports) {
     }, {
       key: "initScrollParent",
       value: function initScrollParent() {
-        var _this = this;
-
+        var _this = this,
+          _$scrollParent$;
         var getParentWithOverflow = function getParentWithOverflow() {
           var cssAttributes = ["overflow", "overflow-y"];
-
           var hasOverFlow = function hasOverFlow($el) {
-            var _iterator = _createForOfIteratorHelper(cssAttributes),
-                _step;
-
-            try {
-              for (_iterator.s(); !(_step = _iterator.n()).done;) {
-                var attr = _step.value;
-                var overflowValue = $el.css(attr);
-
-                if (overflowValue === "auto" || overflowValue === "scroll") {
-                  return true;
-                }
+            for (var _i = 0, _cssAttributes = cssAttributes; _i < _cssAttributes.length; _i++) {
+              var attr = _cssAttributes[_i];
+              var overflowValue = $el.css(attr);
+              if (overflowValue === "auto" || overflowValue === "scroll") {
+                return true;
               }
-            } catch (err) {
-              _iterator.e(err);
-            } finally {
-              _iterator.f();
             }
-
             return false;
           };
-
           if (hasOverFlow(_this.treeWidget.$el)) {
             return _this.treeWidget.$el;
           }
-
-          var _iterator2 = _createForOfIteratorHelper(_this.treeWidget.$el.parents().get()),
-              _step2;
-
+          var _iterator = _createForOfIteratorHelper(_this.treeWidget.$el.parents().get()),
+            _step;
           try {
-            for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
-              var el = _step2.value;
+            for (_iterator.s(); !(_step = _iterator.n()).done;) {
+              var el = _step.value;
               var $el = jQuery(el);
-
               if (hasOverFlow($el)) {
                 return $el;
               }
             }
           } catch (err) {
-            _iterator2.e(err);
+            _iterator.e(err);
           } finally {
-            _iterator2.f();
+            _iterator.f();
           }
-
           return null;
         };
-
         var setDocumentAsScrollParent = function setDocumentAsScrollParent() {
           _this.scrollParentTop = 0;
           _this.$scrollParent = null;
         };
-
         if (this.treeWidget.$el.css("position") === "fixed") {
           setDocumentAsScrollParent();
         }
-
         var $scrollParent = getParentWithOverflow();
-
-        if ($scrollParent && $scrollParent.length && $scrollParent[0].tagName !== "HTML") {
+        if ($scrollParent && $scrollParent.length && ((_$scrollParent$ = $scrollParent[0]) === null || _$scrollParent$ === void 0 ? void 0 : _$scrollParent$.tagName) !== "HTML") {
           this.$scrollParent = $scrollParent;
           var offset = this.$scrollParent.offset();
           this.scrollParentTop = offset ? offset.top : 0;
         } else {
           setDocumentAsScrollParent();
         }
-
         this.isInitialized = true;
       }
     }, {
@@ -3149,13 +2789,10 @@ var jqtree = (function (exports) {
       key: "handleVerticalScrollingWithScrollParent",
       value: function handleVerticalScrollingWithScrollParent(area) {
         var scrollParent = this.$scrollParent && this.$scrollParent[0];
-
         if (!scrollParent) {
           return;
         }
-
         var distanceBottom = this.scrollParentTop + scrollParent.offsetHeight - area.bottom;
-
         if (distanceBottom < 20) {
           scrollParent.scrollTop += 20;
           this.treeWidget.refreshHitAreas();
@@ -3171,12 +2808,10 @@ var jqtree = (function (exports) {
       value: function handleVerticalScrollingWithDocument(area) {
         var scrollTop = jQuery(document).scrollTop() || 0;
         var distanceTop = area.top - scrollTop;
-
         if (distanceTop < 20) {
           jQuery(document).scrollTop(scrollTop - 20);
         } else {
           var windowHeight = jQuery(window).height() || 0;
-
           if (windowHeight - (area.bottom - scrollTop) < 20) {
             jQuery(document).scrollTop(scrollTop + 20);
           }
@@ -3186,10 +2821,8 @@ var jqtree = (function (exports) {
       key: "checkVerticalScrolling",
       value: function checkVerticalScrolling() {
         var hoveredArea = this.treeWidget.dndHandler.hoveredArea;
-
         if (hoveredArea && hoveredArea.top !== this.previousTop) {
           this.previousTop = hoveredArea.top;
-
           if (this.$scrollParent) {
             this.handleVerticalScrollingWithScrollParent(hoveredArea);
           } else {
@@ -3201,11 +2834,9 @@ var jqtree = (function (exports) {
       key: "checkHorizontalScrolling",
       value: function checkHorizontalScrolling() {
         var positionInfo = this.treeWidget.dndHandler.positionInfo;
-
         if (!positionInfo) {
           return;
         }
-
         if (this.$scrollParent) {
           this.handleHorizontalScrollingWithParent(positionInfo);
         } else {
@@ -3218,22 +2849,21 @@ var jqtree = (function (exports) {
         if (positionInfo.pageX === undefined || positionInfo.pageY === undefined) {
           return;
         }
-
         var $scrollParent = this.$scrollParent;
         var scrollParentOffset = $scrollParent && $scrollParent.offset();
-
         if (!($scrollParent && scrollParentOffset)) {
           return;
         }
-
         var scrollParent = $scrollParent[0];
+        if (!scrollParent) {
+          return;
+        }
         var canScrollRight = scrollParent.scrollLeft + scrollParent.clientWidth < scrollParent.scrollWidth;
         var canScrollLeft = scrollParent.scrollLeft > 0;
         var rightEdge = scrollParentOffset.left + scrollParent.clientWidth;
         var leftEdge = scrollParentOffset.left;
         var isNearRightEdge = positionInfo.pageX > rightEdge - 20;
         var isNearLeftEdge = positionInfo.pageX < leftEdge + 20;
-
         if (isNearRightEdge && canScrollRight) {
           scrollParent.scrollLeft = Math.min(scrollParent.scrollLeft + 20, scrollParent.scrollWidth);
         } else if (isNearLeftEdge && canScrollLeft) {
@@ -3246,14 +2876,12 @@ var jqtree = (function (exports) {
         if (positionInfo.pageX === undefined || positionInfo.pageY === undefined) {
           return;
         }
-
         var $document = jQuery(document);
         var scrollLeft = $document.scrollLeft() || 0;
         var windowWidth = jQuery(window).width() || 0;
         var canScrollLeft = scrollLeft > 0;
         var isNearRightEdge = positionInfo.pageX > windowWidth - 20;
         var isNearLeftEdge = positionInfo.pageX - scrollLeft < 20;
-
         if (isNearRightEdge) {
           $document.scrollLeft(scrollLeft + 20);
         } else if (isNearLeftEdge && canScrollLeft) {
@@ -3261,32 +2889,25 @@ var jqtree = (function (exports) {
         }
       }
     }]);
-
     return ScrollHandler;
   }();
 
   var SelectNodeHandler = /*#__PURE__*/function () {
     function SelectNodeHandler(treeWidget) {
       _classCallCheck(this, SelectNodeHandler);
-
       _defineProperty(this, "treeWidget", void 0);
-
       _defineProperty(this, "selectedNodes", void 0);
-
       _defineProperty(this, "selectedSingleNode", void 0);
-
       this.treeWidget = treeWidget;
       this.selectedNodes = new Set();
       this.clear();
     }
-
     _createClass(SelectNodeHandler, [{
       key: "getSelectedNode",
       value: function getSelectedNode() {
         var selectedNodes = this.getSelectedNodes();
-
         if (selectedNodes.length) {
-          return selectedNodes[0];
+          return selectedNodes[0] || false;
         } else {
           return false;
         }
@@ -3295,14 +2916,12 @@ var jqtree = (function (exports) {
       key: "getSelectedNodes",
       value: function getSelectedNodes() {
         var _this = this;
-
         if (this.selectedSingleNode) {
           return [this.selectedSingleNode];
         } else {
           var selectedNodes = [];
           this.selectedNodes.forEach(function (id) {
             var node = _this.treeWidget.getNodeById(id);
-
             if (node) {
               selectedNodes.push(node);
             }
@@ -3321,17 +2940,14 @@ var jqtree = (function (exports) {
           }
         } else {
           var selectedNodes = [];
-
           for (var id in this.selectedNodes) {
             if (Object.prototype.hasOwnProperty.call(this.selectedNodes, id)) {
               var node = this.treeWidget.getNodeById(id);
-
               if (node && parent.isParentOf(node)) {
                 selectedNodes.push(node);
               }
             }
           }
-
           return selectedNodes;
         }
       }
@@ -3356,22 +2972,18 @@ var jqtree = (function (exports) {
       key: "removeFromSelection",
       value: function removeFromSelection(node) {
         var _this2 = this;
-
         var includeChildren = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
-
         if (node.id == null) {
           if (this.selectedSingleNode && node.element === this.selectedSingleNode.element) {
             this.selectedSingleNode = null;
           }
         } else {
           this.selectedNodes["delete"](node.id);
-
           if (includeChildren) {
             node.iterate(function () {
               if (node.id != null) {
                 _this2.selectedNodes["delete"](node.id);
               }
-
               return true;
             });
           }
@@ -3393,37 +3005,28 @@ var jqtree = (function (exports) {
         return Boolean(activeElement && activeElement.tagName === "SPAN" && this.treeWidget._containsElement(activeElement));
       }
     }]);
-
     return SelectNodeHandler;
   }();
 
   var NodeElement = /*#__PURE__*/function () {
     function NodeElement(node, treeWidget) {
       _classCallCheck(this, NodeElement);
-
       _defineProperty(this, "node", void 0);
-
       _defineProperty(this, "$element", void 0);
-
       _defineProperty(this, "treeWidget", void 0);
-
       this.init(node, treeWidget);
     }
-
     _createClass(NodeElement, [{
       key: "init",
       value: function init(node, treeWidget) {
         this.node = node;
         this.treeWidget = treeWidget;
-
         if (!node.element) {
           var element = this.treeWidget.element.get(0);
-
           if (element) {
             node.element = element;
           }
         }
-
         if (node.element) {
           this.$element = jQuery(node.element);
         }
@@ -3441,13 +3044,11 @@ var jqtree = (function (exports) {
       key: "select",
       value: function select(mustSetFocus) {
         var _this$treeWidget$opti;
-
         var $li = this.getLi();
         $li.addClass("jqtree-selected");
-        $li.attr("aria-selected", "true");
         var $span = this.getSpan();
         $span.attr("tabindex", (_this$treeWidget$opti = this.treeWidget.options.tabIndex) !== null && _this$treeWidget$opti !== void 0 ? _this$treeWidget$opti : null);
-
+        $span.attr("aria-selected", "true");
         if (mustSetFocus) {
           $span.trigger("focus");
         }
@@ -3457,10 +3058,10 @@ var jqtree = (function (exports) {
       value: function deselect() {
         var $li = this.getLi();
         $li.removeClass("jqtree-selected");
-        $li.attr("aria-selected", "false");
         var $span = this.getSpan();
         $span.removeAttr("tabindex");
-        $span.blur();
+        $span.attr("aria-selected", "false");
+        $span.trigger("blur");
       }
     }, {
       key: "getUl",
@@ -3483,61 +3084,48 @@ var jqtree = (function (exports) {
         return position === Position.Inside;
       }
     }]);
-
     return NodeElement;
   }();
   var FolderElement = /*#__PURE__*/function (_NodeElement) {
     _inherits(FolderElement, _NodeElement);
-
     var _super = _createSuper(FolderElement);
-
     function FolderElement() {
       _classCallCheck(this, FolderElement);
-
       return _super.apply(this, arguments);
     }
-
     _createClass(FolderElement, [{
       key: "open",
       value: function open(onFinished) {
         var _this = this;
-
         var slide = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
         var animationSpeed = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : "fast";
-
         if (this.node.is_open) {
           return;
         }
-
         this.node.is_open = true;
         var $button = this.getButton();
         $button.removeClass("jqtree-closed");
         $button.html("");
         var buttonEl = $button.get(0);
-
         if (buttonEl) {
-          var icon = this.treeWidget.renderer.openedIconElement.cloneNode(true);
-          buttonEl.appendChild(icon);
+          var openedIconElement = this.treeWidget.renderer.openedIconElement;
+          if (openedIconElement) {
+            var icon = openedIconElement.cloneNode(true);
+            buttonEl.appendChild(icon);
+          }
         }
-
         var doOpen = function doOpen() {
           var $li = _this.getLi();
-
           $li.removeClass("jqtree-closed");
-
-          var $span = _this.getSpan();
-
-          $span.attr("aria-expanded", "true");
-
+          var $titleSpan = _this.getSpan();
+          $titleSpan.attr("aria-expanded", "true");
           if (onFinished) {
             onFinished(_this.node);
           }
-
           _this.treeWidget._triggerEvent("tree.open", {
             node: _this.node
           });
         };
-
         if (slide) {
           this.getUl().slideDown(animationSpeed, doOpen);
         } else {
@@ -3549,39 +3137,32 @@ var jqtree = (function (exports) {
       key: "close",
       value: function close() {
         var _this2 = this;
-
         var slide = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : true;
         var animationSpeed = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : "fast";
-
         if (!this.node.is_open) {
           return;
         }
-
         this.node.is_open = false;
         var $button = this.getButton();
         $button.addClass("jqtree-closed");
         $button.html("");
         var buttonEl = $button.get(0);
-
         if (buttonEl) {
-          var icon = this.treeWidget.renderer.closedIconElement.cloneNode(true);
-          buttonEl.appendChild(icon);
+          var closedIconElement = this.treeWidget.renderer.closedIconElement;
+          if (closedIconElement) {
+            var icon = closedIconElement.cloneNode(true);
+            buttonEl.appendChild(icon);
+          }
         }
-
         var doClose = function doClose() {
           var $li = _this2.getLi();
-
           $li.addClass("jqtree-closed");
-
-          var $span = _this2.getSpan();
-
-          $span.attr("aria-expanded", "false");
-
+          var $titleSpan = _this2.getSpan();
+          $titleSpan.attr("aria-expanded", "false");
           _this2.treeWidget._triggerEvent("tree.close", {
             node: _this2.node
           });
         };
-
         if (slide) {
           this.getUl().slideUp(animationSpeed, doClose);
         } else {
@@ -3600,15 +3181,12 @@ var jqtree = (function (exports) {
         return this.$element.children(".jqtree-element").find("a.jqtree-toggler");
       }
     }]);
-
     return FolderElement;
   }(NodeElement);
   var BorderDropHint = /*#__PURE__*/function () {
     function BorderDropHint($element, scrollLeft) {
       _classCallCheck(this, BorderDropHint);
-
       _defineProperty(this, "$hint", void 0);
-
       var $div = $element.children(".jqtree-element");
       var elWidth = $element.width() || 0;
       var width = Math.max(elWidth + scrollLeft - 4, 0);
@@ -3621,31 +3199,23 @@ var jqtree = (function (exports) {
         height: height
       });
     }
-
     _createClass(BorderDropHint, [{
       key: "remove",
       value: function remove() {
         this.$hint.remove();
       }
     }]);
-
     return BorderDropHint;
   }();
-
   var GhostDropHint = /*#__PURE__*/function () {
     function GhostDropHint(node, $element, position) {
       _classCallCheck(this, GhostDropHint);
-
       _defineProperty(this, "$element", void 0);
-
       _defineProperty(this, "node", void 0);
-
       _defineProperty(this, "$ghost", void 0);
-
       this.$element = $element;
       this.node = node;
       this.$ghost = jQuery("<li class=\"jqtree_common jqtree-ghost\"><span class=\"jqtree_common jqtree-circle\"></span>\n            <span class=\"jqtree_common jqtree-line\"></span></li>");
-
       if (position === Position.After) {
         this.moveAfter();
       } else if (position === Position.Before) {
@@ -3658,7 +3228,6 @@ var jqtree = (function (exports) {
         }
       }
     }
-
     _createClass(GhostDropHint, [{
       key: "remove",
       value: function remove() {
@@ -3677,8 +3246,8 @@ var jqtree = (function (exports) {
     }, {
       key: "moveInsideOpenFolder",
       value: function moveInsideOpenFolder() {
-        var childElement = this.node.children[0].element;
-
+        var _this$node$children$;
+        var childElement = (_this$node$children$ = this.node.children[0]) === null || _this$node$children$ === void 0 ? void 0 : _this$node$children$.element;
         if (childElement) {
           jQuery(childElement).before(this.$ghost);
         }
@@ -3690,7 +3259,6 @@ var jqtree = (function (exports) {
         this.$ghost.addClass("jqtree-inside");
       }
     }]);
-
     return GhostDropHint;
   }();
 
@@ -3698,67 +3266,45 @@ var jqtree = (function (exports) {
   var PARAM_IS_EMPTY = "Parameter is empty: ";
   var JqTreeWidget = /*#__PURE__*/function (_MouseWidget) {
     _inherits(JqTreeWidget, _MouseWidget);
-
     var _super = _createSuper(JqTreeWidget);
-
     function JqTreeWidget() {
       var _this;
-
       _classCallCheck(this, JqTreeWidget);
-
       for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
         args[_key] = arguments[_key];
       }
-
       _this = _super.call.apply(_super, [this].concat(args));
-
       _defineProperty(_assertThisInitialized(_this), "element", void 0);
-
       _defineProperty(_assertThisInitialized(_this), "tree", void 0);
-
       _defineProperty(_assertThisInitialized(_this), "dndHandler", void 0);
-
       _defineProperty(_assertThisInitialized(_this), "renderer", void 0);
-
       _defineProperty(_assertThisInitialized(_this), "dataLoader", void 0);
-
       _defineProperty(_assertThisInitialized(_this), "scrollHandler", void 0);
-
       _defineProperty(_assertThisInitialized(_this), "selectNodeHandler", void 0);
-
       _defineProperty(_assertThisInitialized(_this), "isInitialized", void 0);
-
       _defineProperty(_assertThisInitialized(_this), "saveStateHandler", void 0);
-
       _defineProperty(_assertThisInitialized(_this), "keyHandler", void 0);
-
       _defineProperty(_assertThisInitialized(_this), "handleClick", function (e) {
         var clickTarget = _this.getClickTarget(e.target);
-
         if (clickTarget) {
           if (clickTarget.type === "button") {
             _this.toggle(clickTarget.node, _this.options.slide);
-
             e.preventDefault();
             e.stopPropagation();
           } else if (clickTarget.type === "label") {
             var _node2 = clickTarget.node;
-
             var event = _this._triggerEvent("tree.click", {
               node: _node2,
               click_event: e
             });
-
             if (!event.isDefaultPrevented()) {
               _this.doSelectNode(_node2);
             }
           }
         }
       });
-
       _defineProperty(_assertThisInitialized(_this), "handleDblclick", function (e) {
         var clickTarget = _this.getClickTarget(e.target);
-
         if ((clickTarget === null || clickTarget === void 0 ? void 0 : clickTarget.type) === "label") {
           _this._triggerEvent("tree.dblclick", {
             node: clickTarget.node,
@@ -3766,49 +3312,37 @@ var jqtree = (function (exports) {
           });
         }
       });
-
       _defineProperty(_assertThisInitialized(_this), "handleContextmenu", function (e) {
         var $div = jQuery(e.target).closest("ul.jqtree-tree .jqtree-element");
-
         if ($div.length) {
           var _node3 = _this.getNode($div);
-
           if (_node3) {
             e.preventDefault();
             e.stopPropagation();
-
             _this._triggerEvent("tree.contextmenu", {
               node: _node3,
               click_event: e
             });
-
             return false;
           }
         }
-
         return null;
       });
-
       return _this;
     }
-
     _createClass(JqTreeWidget, [{
       key: "toggle",
       value: function toggle(node) {
         var slideParam = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : null;
-
         if (!node) {
           throw Error(NODE_PARAM_IS_EMPTY);
         }
-
         var slide = slideParam !== null && slideParam !== void 0 ? slideParam : this.options.slide;
-
         if (node.is_open) {
           this.closeNode(node, slide);
         } else {
           this.openNode(node, slide);
         }
-
         return this.element;
       }
     }, {
@@ -3838,6 +3372,7 @@ var jqtree = (function (exports) {
         this.doLoadData(data, parentNode);
         return this.element;
       }
+
       /*
       signatures:
       - loadDataFromUrl(url, parent_node=null, on_finished=null)
@@ -3851,7 +3386,6 @@ var jqtree = (function (exports) {
           loadDataFromUrl(null, function() { console.log('finished'); });
           loadDataFromUrl(node1, function() { console.log('finished'); });
       */
-
     }, {
       key: "loadDataFromUrl",
       value: function loadDataFromUrl(param1, param2, param3) {
@@ -3862,7 +3396,6 @@ var jqtree = (function (exports) {
           // first parameter is not url
           this.doLoadDataFromUrl(null, param1, param2);
         }
-
         return this.element;
       }
     }, {
@@ -3875,7 +3408,6 @@ var jqtree = (function (exports) {
       key: "refresh",
       value: function refresh() {
         this._refreshElements(null);
-
         return this.element;
       }
     }, {
@@ -3912,15 +3444,12 @@ var jqtree = (function (exports) {
       key: "openNode",
       value: function openNode(node, param1, param2) {
         var _this2 = this;
-
         if (!node) {
           throw Error(NODE_PARAM_IS_EMPTY);
         }
-
         var parseParams = function parseParams() {
           var onFinished;
           var slide;
-
           if (isFunction(param1)) {
             onFinished = param1;
             slide = null;
@@ -3928,23 +3457,17 @@ var jqtree = (function (exports) {
             slide = param1;
             onFinished = param2;
           }
-
           if (slide == null) {
             var _this2$options$slide;
-
             slide = (_this2$options$slide = _this2.options.slide) !== null && _this2$options$slide !== void 0 ? _this2$options$slide : false;
           }
-
           return [slide, onFinished];
         };
-
         var _parseParams = parseParams(),
-            _parseParams2 = _slicedToArray(_parseParams, 2),
-            slide = _parseParams2[0],
-            onFinished = _parseParams2[1];
-
+          _parseParams2 = _slicedToArray(_parseParams, 2),
+          slide = _parseParams2[0],
+          onFinished = _parseParams2[1];
         this._openNode(node, slide, onFinished);
-
         return this.element;
       }
     }, {
@@ -3953,14 +3476,11 @@ var jqtree = (function (exports) {
         if (!node) {
           throw Error(NODE_PARAM_IS_EMPTY);
         }
-
         var slide = slideParam !== null && slideParam !== void 0 ? slideParam : this.options.slide;
-
         if (node.isFolder() || node.isEmptyFolder) {
           new FolderElement(node, this).close(slide, this.options.animationSpeed);
           this.saveState();
         }
-
         return this.element;
       }
     }, {
@@ -3978,11 +3498,9 @@ var jqtree = (function (exports) {
       key: "addNodeAfter",
       value: function addNodeAfter(newNodeInfo, existingNode) {
         var newNode = existingNode.addAfter(newNodeInfo);
-
         if (newNode) {
           this._refreshElements(existingNode.parent);
         }
-
         return newNode;
       }
     }, {
@@ -3991,13 +3509,10 @@ var jqtree = (function (exports) {
         if (!existingNode) {
           throw Error(PARAM_IS_EMPTY + "existingNode");
         }
-
         var newNode = existingNode.addBefore(newNodeInfo);
-
         if (newNode) {
           this._refreshElements(existingNode.parent);
         }
-
         return newNode;
       }
     }, {
@@ -4006,13 +3521,10 @@ var jqtree = (function (exports) {
         if (!existingNode) {
           throw Error(PARAM_IS_EMPTY + "existingNode");
         }
-
         var newNode = existingNode.addParent(newNodeInfo);
-
         if (newNode) {
           this._refreshElements(newNode.parent);
         }
-
         return newNode;
       }
     }, {
@@ -4021,18 +3533,14 @@ var jqtree = (function (exports) {
         if (!node) {
           throw Error(NODE_PARAM_IS_EMPTY);
         }
-
         if (!node.parent) {
           throw Error("Node has no parent");
         }
-
         this.selectNodeHandler.removeFromSelection(node, true); // including children
 
         var parent = node.parent;
         node.remove();
-
         this._refreshElements(parent);
-
         return this.element;
       }
     }, {
@@ -4040,9 +3548,7 @@ var jqtree = (function (exports) {
       value: function appendNode(newNodeInfo, parentNodeParam) {
         var parentNode = parentNodeParam || this.tree;
         var node = parentNode.append(newNodeInfo);
-
         this._refreshElements(parentNode);
-
         return node;
       }
     }, {
@@ -4050,9 +3556,7 @@ var jqtree = (function (exports) {
       value: function prependNode(newNodeInfo, parentNodeParam) {
         var parentNode = parentNodeParam !== null && parentNodeParam !== void 0 ? parentNodeParam : this.tree;
         var node = parentNode.prepend(newNodeInfo);
-
         this._refreshElements(parentNode);
-
         return node;
       }
     }, {
@@ -4061,36 +3565,27 @@ var jqtree = (function (exports) {
         if (!node) {
           throw Error(NODE_PARAM_IS_EMPTY);
         }
-
         var idIsChanged = _typeof(data) === "object" && data.id && data.id !== node.id;
-
         if (idIsChanged) {
           this.tree.removeNodeFromIndex(node);
         }
-
         node.setData(data);
-
         if (idIsChanged) {
           this.tree.addNodeToIndex(node);
         }
-
         if (_typeof(data) === "object" && data["children"] && data["children"] instanceof Array) {
           node.removeChildren();
-
           if (data.children.length) {
             node.loadFromData(data.children);
           }
         }
-
         this._refreshElements(node);
-
         return this.element;
       }
     }, {
       key: "isSelectedNodeInSubtree",
       value: function isSelectedNodeInSubtree(subtree) {
         var selectedNode = this.getSelectedNode();
-
         if (!selectedNode) {
           return false;
         } else {
@@ -4103,19 +3598,14 @@ var jqtree = (function (exports) {
         if (!node) {
           throw Error(NODE_PARAM_IS_EMPTY);
         }
-
         if (!targetNode) {
           throw Error(PARAM_IS_EMPTY + "targetNode");
         }
-
         var positionIndex = getPosition(position);
-
         if (positionIndex !== undefined) {
           this.tree.moveNode(node, targetNode, positionIndex);
-
           this._refreshElements(null);
         }
-
         return this.element;
       }
     }, {
@@ -4129,11 +3619,8 @@ var jqtree = (function (exports) {
         if (!node) {
           throw Error(NODE_PARAM_IS_EMPTY);
         }
-
         this.selectNodeHandler.addToSelection(node);
-
         this._getNodeElementForNode(node).select(mustSetFocus === undefined ? true : mustSetFocus);
-
         this.saveState();
         return this.element;
       }
@@ -4148,7 +3635,6 @@ var jqtree = (function (exports) {
         if (!node) {
           throw Error(NODE_PARAM_IS_EMPTY);
         }
-
         return this.selectNodeHandler.isNodeSelected(node);
       }
     }, {
@@ -4157,11 +3643,8 @@ var jqtree = (function (exports) {
         if (!node) {
           throw Error(NODE_PARAM_IS_EMPTY);
         }
-
         this.selectNodeHandler.removeFromSelection(node);
-
         this._getNodeElementForNode(node).deselect();
-
         this.saveState();
         return this.element;
       }
@@ -4171,7 +3654,6 @@ var jqtree = (function (exports) {
         if (!node) {
           throw Error(NODE_PARAM_IS_EMPTY);
         }
-
         var nodeOffset = jQuery(node.element).offset();
         var nodeTop = nodeOffset ? nodeOffset.top : 0;
         var treeOffset = this.$el.offset();
@@ -4189,9 +3671,7 @@ var jqtree = (function (exports) {
       key: "setState",
       value: function setState(state) {
         this.saveStateHandler.setInitialState(state);
-
         this._refreshElements(null);
-
         return this.element;
       }
     }, {
@@ -4204,22 +3684,18 @@ var jqtree = (function (exports) {
       key: "moveDown",
       value: function moveDown() {
         var selectedNode = this.getSelectedNode();
-
         if (selectedNode) {
           this.keyHandler.moveDown(selectedNode);
         }
-
         return this.element;
       }
     }, {
       key: "moveUp",
       value: function moveUp() {
         var selectedNode = this.getSelectedNode();
-
         if (selectedNode) {
           this.keyHandler.moveUp(selectedNode);
         }
-
         return this.element;
       }
     }, {
@@ -4238,51 +3714,43 @@ var jqtree = (function (exports) {
       key: "_openNode",
       value: function _openNode(node) {
         var _this3 = this;
-
         var slide = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
         var onFinished = arguments.length > 2 ? arguments[2] : undefined;
-
         var doOpenNode = function doOpenNode(_node, _slide, _onFinished) {
           var folderElement = new FolderElement(_node, _this3);
           folderElement.open(_onFinished, _slide, _this3.options.animationSpeed);
         };
-
         if (node.isFolder() || node.isEmptyFolder) {
           if (node.load_on_demand) {
             this.loadFolderOnDemand(node, slide, onFinished);
           } else {
             var parent = node.parent;
-
             while (parent) {
               // nb: do not open root element
               if (parent.parent) {
                 doOpenNode(parent, false, null);
               }
-
               parent = parent.parent;
             }
-
             doOpenNode(node, slide, onFinished);
             this.saveState();
           }
         }
       }
+
       /*
       Redraw the tree or part of the tree.
        from_node: redraw this subtree
       */
-
     }, {
       key: "_refreshElements",
       value: function _refreshElements(fromNode) {
         var mustSetFocus = this.selectNodeHandler.isFocusOnTree();
         var mustSelect = fromNode ? this.isSelectedNodeInSubtree(fromNode) : false;
         this.renderer.render(fromNode);
-
         if (mustSelect) {
           this.selectCurrentNode(mustSetFocus);
         }
-
         this._triggerEvent("tree.refresh");
       }
     }, {
@@ -4298,7 +3766,6 @@ var jqtree = (function (exports) {
       key: "_getNodeElement",
       value: function _getNodeElement($element) {
         var node = this.getNode($element);
-
         if (node) {
           return this._getNodeElementForNode(node);
         } else {
@@ -4320,15 +3787,12 @@ var jqtree = (function (exports) {
       key: "init",
       value: function init() {
         _get(_getPrototypeOf(JqTreeWidget.prototype), "init", this).call(this);
-
         this.element = this.$el;
         this.isInitialized = false;
         this.options.rtl = this.getRtlOption();
-
         if (this.options.closedIcon == null) {
           this.options.closedIcon = this.getDefaultClosedIcon();
         }
-
         this.renderer = new ElementsRenderer(this);
         this.dataLoader = new DataLoader(this);
         this.saveStateHandler = new SaveStateHandler(this);
@@ -4339,7 +3803,6 @@ var jqtree = (function (exports) {
         this.initData();
         this.element.on("click", this.handleClick);
         this.element.on("dblclick", this.handleDblclick);
-
         if (this.options.useContextMenu) {
           this.element.on("contextmenu", this.handleContextmenu);
         }
@@ -4351,7 +3814,6 @@ var jqtree = (function (exports) {
         this.element.off();
         this.keyHandler.deinit();
         this.tree = new Node({}, true);
-
         _get(_getPrototypeOf(JqTreeWidget.prototype), "deinit", this).call(this);
       }
     }, {
@@ -4396,7 +3858,6 @@ var jqtree = (function (exports) {
       key: "getMouseDelay",
       value: function getMouseDelay() {
         var _this$options$startDn;
-
         return (_this$options$startDn = this.options.startDndDelay) !== null && _this$options$startDn !== void 0 ? _this$options$startDn : 0;
       }
     }, {
@@ -4406,7 +3867,6 @@ var jqtree = (function (exports) {
           this.doLoadData(this.options.data, null);
         } else {
           var dataUrl = this.getDataUrlInfo(null);
-
           if (dataUrl) {
             this.doLoadDataFromUrl(null, null, null);
           } else {
@@ -4418,9 +3878,7 @@ var jqtree = (function (exports) {
       key: "getDataUrlInfo",
       value: function getDataUrlInfo(node) {
         var _this4 = this;
-
         var dataUrl = this.options.dataUrl || this.element.data("url");
-
         var getUrlFromString = function getUrlFromString(url) {
           var urlInfo = {
             url: url
@@ -4428,7 +3886,6 @@ var jqtree = (function (exports) {
           setUrlInfoData(urlInfo);
           return urlInfo;
         };
-
         var setUrlInfoData = function setUrlInfoData(urlInfo) {
           if (node !== null && node !== void 0 && node.id) {
             // Load on demand of a subtree; add node parameter
@@ -4439,7 +3896,6 @@ var jqtree = (function (exports) {
           } else {
             // Add selected_node parameter
             var selectedNodeId = _this4.getNodeIdToBeSelected();
-
             if (selectedNodeId) {
               var _data = {
                 selected_node: selectedNodeId
@@ -4448,7 +3904,6 @@ var jqtree = (function (exports) {
             }
           }
         };
-
         if (typeof dataUrl === "function") {
           return dataUrl(node);
         } else if (typeof dataUrl === "string") {
@@ -4473,68 +3928,57 @@ var jqtree = (function (exports) {
       key: "initTree",
       value: function initTree(data) {
         var _this5 = this;
-
         var doInit = function doInit() {
           if (!_this5.isInitialized) {
             _this5.isInitialized = true;
-
             _this5._triggerEvent("tree.init");
           }
         };
-
         if (!this.options.nodeClass) {
           return;
         }
-
         this.tree = new this.options.nodeClass(null, true, this.options.nodeClass);
         this.selectNodeHandler.clear();
         this.tree.loadFromData(data);
         var mustLoadOnDemand = this.setInitialState();
-
         this._refreshElements(null);
-
         if (!mustLoadOnDemand) {
           doInit();
         } else {
           // Load data on demand and then init the tree
           this.setInitialStateOnDemand(doInit);
         }
-      } // Set initial state, either by restoring the state or auto-opening nodes
-      // result: must load nodes on demand?
+      }
 
+      // Set initial state, either by restoring the state or auto-opening nodes
+      // result: must load nodes on demand?
     }, {
       key: "setInitialState",
       value: function setInitialState() {
         var _this6 = this;
-
         var restoreState = function restoreState() {
           // result: is state restored, must load on demand?
           if (!_this6.options.saveState) {
             return [false, false];
           } else {
             var state = _this6.saveStateHandler.getStateFromStorage();
-
             if (!state) {
               return [false, false];
             } else {
-              var _mustLoadOnDemand = _this6.saveStateHandler.setInitialState(state); // return true: the state is restored
-
+              var _mustLoadOnDemand = _this6.saveStateHandler.setInitialState(state);
 
+              // return true: the state is restored
               return [true, _mustLoadOnDemand];
             }
           }
         };
-
         var autoOpenNodes = function autoOpenNodes() {
           // result: must load on demand?
           if (_this6.options.autoOpen === false) {
             return false;
           }
-
           var maxLevel = _this6.getAutoOpenMaxLevel();
-
           var mustLoadOnDemand = false;
-
           _this6.tree.iterate(function (node, level) {
             if (node.load_on_demand) {
               mustLoadOnDemand = true;
@@ -4546,82 +3990,66 @@ var jqtree = (function (exports) {
               return level !== maxLevel;
             }
           });
-
           return mustLoadOnDemand;
         };
-
         var _restoreState = restoreState(),
-            _restoreState2 = _slicedToArray(_restoreState, 2),
-            isRestored = _restoreState2[0],
-            mustLoadOnDemand = _restoreState2[1]; // eslint-disable-line prefer-const
-
+          _restoreState2 = _slicedToArray(_restoreState, 2),
+          isRestored = _restoreState2[0],
+          mustLoadOnDemand = _restoreState2[1]; // eslint-disable-line prefer-const
 
         if (!isRestored) {
           mustLoadOnDemand = autoOpenNodes();
         }
-
         return mustLoadOnDemand;
-      } // Set the initial state for nodes that are loaded on demand
-      // Call cb_finished when done
+      }
 
+      // Set the initial state for nodes that are loaded on demand
+      // Call cb_finished when done
     }, {
       key: "setInitialStateOnDemand",
       value: function setInitialStateOnDemand(cbFinished) {
         var _this7 = this;
-
         var restoreState = function restoreState() {
           if (!_this7.options.saveState) {
             return false;
           } else {
             var state = _this7.saveStateHandler.getStateFromStorage();
-
             if (!state) {
               return false;
             } else {
               _this7.saveStateHandler.setInitialStateOnDemand(state, cbFinished);
-
               return true;
             }
           }
         };
-
         var autoOpenNodes = function autoOpenNodes() {
           var maxLevel = _this7.getAutoOpenMaxLevel();
-
           var loadingCount = 0;
-
           var loadAndOpenNode = function loadAndOpenNode(node) {
             loadingCount += 1;
-
             _this7._openNode(node, false, function () {
               loadingCount -= 1;
               openNodes();
             });
           };
-
           var openNodes = function openNodes() {
             _this7.tree.iterate(function (node, level) {
               if (node.load_on_demand) {
                 if (!node.is_loading) {
                   loadAndOpenNode(node);
                 }
-
                 return false;
               } else {
                 _this7._openNode(node, false, null);
-
                 return level !== maxLevel;
               }
             });
-
             if (loadingCount === 0) {
               cbFinished();
             }
           };
-
           openNodes();
         };
-
         if (!restoreState()) {
           autoOpenNodes();
         }
@@ -4644,10 +4072,8 @@ var jqtree = (function (exports) {
       value: function getClickTarget(element) {
         var $target = jQuery(element);
         var $button = $target.closest(".jqtree-toggler");
-
         if ($button.length) {
           var _node4 = this.getNode($button);
-
           if (_node4) {
             return {
               type: "button",
@@ -4656,10 +4082,8 @@ var jqtree = (function (exports) {
           }
         } else {
           var $el = $target.closest(".jqtree-element");
-
           if ($el.length) {
             var _node5 = this.getNode($el);
-
             if (_node5) {
               return {
                 type: "label",
@@ -4668,14 +4092,12 @@ var jqtree = (function (exports) {
             }
           }
         }
-
         return null;
       }
     }, {
       key: "getNode",
       value: function getNode($element) {
         var $li = $element.closest("li.jqtree_common");
-
         if ($li.length === 0) {
           return null;
         } else {
@@ -4693,10 +4115,8 @@ var jqtree = (function (exports) {
       key: "selectCurrentNode",
       value: function selectCurrentNode(mustSetFocus) {
         var node = this.getSelectedNode();
-
         if (node) {
           var nodeElement = this._getNodeElementForNode(node);
-
           if (nodeElement) {
             nodeElement.select(mustSetFocus);
           }
@@ -4706,7 +4126,6 @@ var jqtree = (function (exports) {
       key: "deselectCurrentNode",
       value: function deselectCurrentNode() {
         var node = this.getSelectedNode();
-
         if (node) {
           this.removeFromSelection(node);
         }
@@ -4729,7 +4148,6 @@ var jqtree = (function (exports) {
           return this.options.rtl;
         } else {
           var dataRtl = this.element.data("rtl");
-
           if (dataRtl !== null && dataRtl !== false && dataRtl !== undefined) {
             return true;
           } else {
@@ -4741,27 +4159,22 @@ var jqtree = (function (exports) {
       key: "doSelectNode",
       value: function doSelectNode(node, optionsParam) {
         var _this8 = this;
-
         var saveState = function saveState() {
           if (_this8.options.saveState) {
             _this8.saveStateHandler.saveState();
           }
         };
-
         if (!node) {
           // Called with empty node -> deselect current node
           this.deselectCurrentNode();
           saveState();
           return;
         }
-
         var defaultOptions = {
           mustSetFocus: true,
           mustToggle: true
         };
-
         var selectOptions = _objectSpread2(_objectSpread2({}, defaultOptions), optionsParam || {});
-
         var canSelect = function canSelect() {
           if (_this8.options.onCanSelectNode) {
             return _this8.options.selectable === true && _this8.options.onCanSelectNode(node);
@@ -4769,23 +4182,18 @@ var jqtree = (function (exports) {
             return _this8.options.selectable === true;
           }
         };
-
         var openParents = function openParents() {
           var parent = node.parent;
-
           if (parent && parent.parent && !parent.is_open) {
             _this8.openNode(parent, false);
           }
         };
-
         if (!canSelect()) {
           return;
         }
-
         if (this.selectNodeHandler.isNodeSelected(node)) {
           if (selectOptions.mustToggle) {
             this.deselectCurrentNode();
-
             this._triggerEvent("tree.select", {
               node: null,
               previous_node: node
@@ -4795,47 +4203,39 @@ var jqtree = (function (exports) {
           var deselectedNode = this.getSelectedNode() || null;
           this.deselectCurrentNode();
           this.addToSelection(node, selectOptions.mustSetFocus);
-
           this._triggerEvent("tree.select", {
             node: node,
             deselected_node: deselectedNode
           });
-
           openParents();
         }
-
         saveState();
       }
     }, {
       key: "doLoadData",
       value: function doLoadData(data, parentNode) {
-        if (!data) {
-          return;
-        } else {
-          this._triggerEvent("tree.load_data", {
-            tree_data: data
-          });
-
+        if (data) {
           if (parentNode) {
             this.deselectNodes(parentNode);
             this.loadSubtree(data, parentNode);
           } else {
             this.initTree(data);
           }
-
           if (this.isDragging()) {
             this.dndHandler.refresh();
           }
         }
+        this._triggerEvent("tree.load_data", {
+          tree_data: data,
+          parent_node: parentNode
+        });
       }
     }, {
       key: "deselectNodes",
       value: function deselectNodes(parentNode) {
         var selectedNodesUnderParent = this.selectNodeHandler.getSelectedNodesUnder(parentNode);
-
         var _iterator = _createForOfIteratorHelper(selectedNodesUnderParent),
-            _step;
-
+          _step;
         try {
           for (_iterator.s(); !(_step = _iterator.n()).done;) {
             var n = _step.value;
@@ -4853,7 +4253,6 @@ var jqtree = (function (exports) {
         parentNode.loadFromData(data);
         parentNode.load_on_demand = false;
         parentNode.is_loading = false;
-
         this._refreshElements(parentNode);
       }
     }, {
@@ -4866,7 +4265,6 @@ var jqtree = (function (exports) {
       key: "loadFolderOnDemand",
       value: function loadFolderOnDemand(node) {
         var _this9 = this;
-
         var slide = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
         var onFinished = arguments.length > 2 ? arguments[2] : undefined;
         node.is_loading = true;
@@ -4875,10 +4273,8 @@ var jqtree = (function (exports) {
         });
       }
     }]);
-
     return JqTreeWidget;
   }(MouseWidget);
-
   _defineProperty(JqTreeWidget, "defaults", {
     animationSpeed: "fast",
     autoEscape: true,
@@ -4925,13 +4321,10 @@ var jqtree = (function (exports) {
     tabIndex: 0,
     useContextMenu: true
   });
-
   SimpleWidget.register(JqTreeWidget, "tree");
 
   exports.JqTreeWidget = JqTreeWidget;
 
-  Object.defineProperty(exports, '__esModule', { value: true });
-
   return exports;
 
 })({});