jqtree 1.7.0 → 1.7.1

package/lib/nodeElement.js

@@ -57,9 +57,9 @@ var NodeElement = /*#__PURE__*/function () {
       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");
       }
@@ -69,10 +69,10 @@ var NodeElement = /*#__PURE__*/function () {
     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",
@@ -120,14 +120,17 @@ var FolderElement = /*#__PURE__*/function (_NodeElement) {
       $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);
         }
@@ -157,14 +160,17 @@ var FolderElement = /*#__PURE__*/function (_NodeElement) {
       $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
         });
@@ -254,7 +260,8 @@ var GhostDropHint = /*#__PURE__*/function () {
   }, {
     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);
       }

package/lib/saveStateHandler.js

@@ -107,7 +107,7 @@ var SaveStateHandler = /*#__PURE__*/function () {
     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;
       }

package/lib/scrollHandler.js

@@ -37,7 +37,7 @@ var ScrollHandler = /*#__PURE__*/function () {
     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();
@@ -83,7 +83,8 @@ var ScrollHandler = /*#__PURE__*/function () {
   }, {
     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) {
@@ -124,7 +125,7 @@ var ScrollHandler = /*#__PURE__*/function () {
         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;
@@ -210,6 +211,9 @@ var ScrollHandler = /*#__PURE__*/function () {
         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;

package/lib/selectNodeHandler.js

@@ -26,7 +26,7 @@ var SelectNodeHandler = /*#__PURE__*/function () {
     value: function getSelectedNode() {
       var selectedNodes = this.getSelectedNodes();
       if (selectedNodes.length) {
-        return selectedNodes[0];
+        return selectedNodes[0] || false;
       } else {
         return false;
       }

package/lib/simple.widget.js

@@ -116,6 +116,8 @@ var _register = function register(widgetClass, widgetName) {
         }
         return callFunction(this, functionName, args);
       }
+    } else {
+      return undefined;
     }
   };
 };

package/lib/test/jqTree/accessibility.test.js

@@ -0,0 +1,37 @@
+"use strict";
+
+function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
+var _jestAxe = require("jest-axe");
+require("../../tree.jquery");
+var _exampleData = _interopRequireDefault(require("../support/exampleData"));
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
+function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return exports; }; var exports = {}, Op = Object.prototype, hasOwn = Op.hasOwnProperty, defineProperty = Object.defineProperty || function (obj, key, desc) { obj[key] = desc.value; }, $Symbol = "function" == typeof Symbol ? Symbol : {}, iteratorSymbol = $Symbol.iterator || "@@iterator", asyncIteratorSymbol = $Symbol.asyncIterator || "@@asyncIterator", toStringTagSymbol = $Symbol.toStringTag || "@@toStringTag"; function define(obj, key, value) { return Object.defineProperty(obj, key, { value: value, enumerable: !0, configurable: !0, writable: !0 }), obj[key]; } try { define({}, ""); } catch (err) { define = function define(obj, key, value) { return obj[key] = value; }; } function wrap(innerFn, outerFn, self, tryLocsList) { var protoGenerator = outerFn && outerFn.prototype instanceof Generator ? outerFn : Generator, generator = Object.create(protoGenerator.prototype), context = new Context(tryLocsList || []); return defineProperty(generator, "_invoke", { value: makeInvokeMethod(innerFn, self, context) }), generator; } function tryCatch(fn, obj, arg) { try { return { type: "normal", arg: fn.call(obj, arg) }; } catch (err) { return { type: "throw", arg: err }; } } exports.wrap = wrap; var ContinueSentinel = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var IteratorPrototype = {}; define(IteratorPrototype, iteratorSymbol, function () { return this; }); var getProto = Object.getPrototypeOf, NativeIteratorPrototype = getProto && getProto(getProto(values([]))); NativeIteratorPrototype && NativeIteratorPrototype !== Op && hasOwn.call(NativeIteratorPrototype, iteratorSymbol) && (IteratorPrototype = NativeIteratorPrototype); var Gp = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(IteratorPrototype); function defineIteratorMethods(prototype) { ["next", "throw", "return"].forEach(function (method) { define(prototype, method, function (arg) { return this._invoke(method, arg); }); }); } function AsyncIterator(generator, PromiseImpl) { function invoke(method, arg, resolve, reject) { var record = tryCatch(generator[method], generator, arg); if ("throw" !== record.type) { var result = record.arg, value = result.value; return value && "object" == _typeof(value) && hasOwn.call(value, "__await") ? PromiseImpl.resolve(value.__await).then(function (value) { invoke("next", value, resolve, reject); }, function (err) { invoke("throw", err, resolve, reject); }) : PromiseImpl.resolve(value).then(function (unwrapped) { result.value = unwrapped, resolve(result); }, function (error) { return invoke("throw", error, resolve, reject); }); } reject(record.arg); } var previousPromise; defineProperty(this, "_invoke", { value: function value(method, arg) { function callInvokeWithMethodAndArg() { return new PromiseImpl(function (resolve, reject) { invoke(method, arg, resolve, reject); }); } return previousPromise = previousPromise ? previousPromise.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(innerFn, self, context) { var state = "suspendedStart"; return function (method, arg) { if ("executing" === state) throw new Error("Generator is already running"); if ("completed" === state) { if ("throw" === method) throw arg; return doneResult(); } for (context.method = method, context.arg = arg;;) { var delegate = context.delegate; if (delegate) { var delegateResult = maybeInvokeDelegate(delegate, context); if (delegateResult) { if (delegateResult === ContinueSentinel) continue; return delegateResult; } } if ("next" === context.method) context.sent = context._sent = context.arg;else if ("throw" === context.method) { if ("suspendedStart" === state) throw state = "completed", context.arg; context.dispatchException(context.arg); } else "return" === context.method && context.abrupt("return", context.arg); state = "executing"; var record = tryCatch(innerFn, self, context); if ("normal" === record.type) { if (state = context.done ? "completed" : "suspendedYield", record.arg === ContinueSentinel) continue; return { value: record.arg, done: context.done }; } "throw" === record.type && (state = "completed", context.method = "throw", context.arg = record.arg); } }; } function maybeInvokeDelegate(delegate, context) { var methodName = context.method, method = delegate.iterator[methodName]; if (undefined === method) return context.delegate = null, "throw" === methodName && delegate.iterator["return"] && (context.method = "return", context.arg = undefined, maybeInvokeDelegate(delegate, context), "throw" === context.method) || "return" !== methodName && (context.method = "throw", context.arg = new TypeError("The iterator does not provide a '" + methodName + "' method")), ContinueSentinel; var record = tryCatch(method, delegate.iterator, context.arg); if ("throw" === record.type) return context.method = "throw", context.arg = record.arg, context.delegate = null, ContinueSentinel; var info = record.arg; return info ? info.done ? (context[delegate.resultName] = info.value, context.next = delegate.nextLoc, "return" !== context.method && (context.method = "next", context.arg = undefined), context.delegate = null, ContinueSentinel) : info : (context.method = "throw", context.arg = new TypeError("iterator result is not an object"), context.delegate = null, ContinueSentinel); } function pushTryEntry(locs) { var entry = { tryLoc: locs[0] }; 1 in locs && (entry.catchLoc = locs[1]), 2 in locs && (entry.finallyLoc = locs[2], entry.afterLoc = locs[3]), this.tryEntries.push(entry); } function resetTryEntry(entry) { var record = entry.completion || {}; record.type = "normal", delete record.arg, entry.completion = record; } function Context(tryLocsList) { this.tryEntries = [{ tryLoc: "root" }], tryLocsList.forEach(pushTryEntry, this), this.reset(!0); } function values(iterable) { if (iterable) { var iteratorMethod = iterable[iteratorSymbol]; if (iteratorMethod) return iteratorMethod.call(iterable); if ("function" == typeof iterable.next) return iterable; if (!isNaN(iterable.length)) { var i = -1, next = function next() { for (; ++i < iterable.length;) if (hasOwn.call(iterable, i)) return next.value = iterable[i], next.done = !1, next; return next.value = undefined, next.done = !0, next; }; return next.next = next; } } return { next: doneResult }; } function doneResult() { return { value: undefined, done: !0 }; } return GeneratorFunction.prototype = GeneratorFunctionPrototype, defineProperty(Gp, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), defineProperty(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, toStringTagSymbol, "GeneratorFunction"), exports.isGeneratorFunction = function (genFun) { var ctor = "function" == typeof genFun && genFun.constructor; return !!ctor && (ctor === GeneratorFunction || "GeneratorFunction" === (ctor.displayName || ctor.name)); }, exports.mark = function (genFun) { return Object.setPrototypeOf ? Object.setPrototypeOf(genFun, GeneratorFunctionPrototype) : (genFun.__proto__ = GeneratorFunctionPrototype, define(genFun, toStringTagSymbol, "GeneratorFunction")), genFun.prototype = Object.create(Gp), genFun; }, exports.awrap = function (arg) { return { __await: arg }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, asyncIteratorSymbol, function () { return this; }), exports.AsyncIterator = AsyncIterator, exports.async = function (innerFn, outerFn, self, tryLocsList, PromiseImpl) { void 0 === PromiseImpl && (PromiseImpl = Promise); var iter = new AsyncIterator(wrap(innerFn, outerFn, self, tryLocsList), PromiseImpl); return exports.isGeneratorFunction(outerFn) ? iter : iter.next().then(function (result) { return result.done ? result.value : iter.next(); }); }, defineIteratorMethods(Gp), define(Gp, toStringTagSymbol, "Generator"), define(Gp, iteratorSymbol, function () { return this; }), define(Gp, "toString", function () { return "[object Generator]"; }), exports.keys = function (val) { var object = Object(val), keys = []; for (var key in object) keys.push(key); return keys.reverse(), function next() { for (; keys.length;) { var key = keys.pop(); if (key in object) return next.value = key, next.done = !1, next; } return next.done = !0, next; }; }, exports.values = values, Context.prototype = { constructor: Context, reset: function reset(skipTempReset) { if (this.prev = 0, this.next = 0, this.sent = this._sent = undefined, this.done = !1, this.delegate = null, this.method = "next", this.arg = undefined, this.tryEntries.forEach(resetTryEntry), !skipTempReset) for (var name in this) "t" === name.charAt(0) && hasOwn.call(this, name) && !isNaN(+name.slice(1)) && (this[name] = undefined); }, stop: function stop() { this.done = !0; var rootRecord = this.tryEntries[0].completion; if ("throw" === rootRecord.type) throw rootRecord.arg; return this.rval; }, dispatchException: function dispatchException(exception) { if (this.done) throw exception; var context = this; function handle(loc, caught) { return record.type = "throw", record.arg = exception, context.next = loc, caught && (context.method = "next", context.arg = undefined), !!caught; } for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i], record = entry.completion; if ("root" === entry.tryLoc) return handle("end"); if (entry.tryLoc <= this.prev) { var hasCatch = hasOwn.call(entry, "catchLoc"), hasFinally = hasOwn.call(entry, "finallyLoc"); if (hasCatch && hasFinally) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } else if (hasCatch) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); } else { if (!hasFinally) throw new Error("try statement without catch or finally"); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } } } }, abrupt: function abrupt(type, arg) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc <= this.prev && hasOwn.call(entry, "finallyLoc") && this.prev < entry.finallyLoc) { var finallyEntry = entry; break; } } finallyEntry && ("break" === type || "continue" === type) && finallyEntry.tryLoc <= arg && arg <= finallyEntry.finallyLoc && (finallyEntry = null); var record = finallyEntry ? finallyEntry.completion : {}; return record.type = type, record.arg = arg, finallyEntry ? (this.method = "next", this.next = finallyEntry.finallyLoc, ContinueSentinel) : this.complete(record); }, complete: function complete(record, afterLoc) { if ("throw" === record.type) throw record.arg; return "break" === record.type || "continue" === record.type ? this.next = record.arg : "return" === record.type ? (this.rval = this.arg = record.arg, this.method = "return", this.next = "end") : "normal" === record.type && afterLoc && (this.next = afterLoc), ContinueSentinel; }, finish: function finish(finallyLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.finallyLoc === finallyLoc) return this.complete(entry.completion, entry.afterLoc), resetTryEntry(entry), ContinueSentinel; } }, "catch": function _catch(tryLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc === tryLoc) { var record = entry.completion; if ("throw" === record.type) { var thrown = record.arg; resetTryEntry(entry); } return thrown; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(iterable, resultName, nextLoc) { return this.delegate = { iterator: values(iterable), resultName: resultName, nextLoc: nextLoc }, "next" === this.method && (this.arg = undefined), ContinueSentinel; } }, exports; }
+function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
+function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
+expect.extend(_jestAxe.toHaveNoViolations);
+beforeEach(function () {
+  $("body").append('<div id="tree1"></div>');
+});
+afterEach(function () {
+  var $tree = $("#tree1");
+  $tree.tree("destroy");
+  $tree.remove();
+});
+it("has an accessible ui", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+  var $tree, element;
+  return _regeneratorRuntime().wrap(function _callee$(_context) {
+    while (1) switch (_context.prev = _context.next) {
+      case 0:
+        $tree = $("#tree1");
+        $tree.tree({
+          data: _exampleData["default"]
+        });
+        element = $tree.get()[0];
+        _context.next = 5;
+        return expect((0, _jestAxe.axe)(element)).resolves.toHaveNoViolations();
+      case 5:
+      case "end":
+        return _context.stop();
+    }
+  }, _callee);
+})));

package/lib/test/jqTree/events.test.js

@@ -1,12 +1,17 @@
 "use strict";
 
+function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
 var _givens = _interopRequireDefault(require("givens"));
 var _msw = require("msw");
 var _node = require("msw/node");
+var _dom = require("@testing-library/dom");
 require("../../tree.jquery");
 var _exampleData = _interopRequireDefault(require("../support/exampleData"));
 var _testUtil = require("../support/testUtil");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
+function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return exports; }; var exports = {}, Op = Object.prototype, hasOwn = Op.hasOwnProperty, defineProperty = Object.defineProperty || function (obj, key, desc) { obj[key] = desc.value; }, $Symbol = "function" == typeof Symbol ? Symbol : {}, iteratorSymbol = $Symbol.iterator || "@@iterator", asyncIteratorSymbol = $Symbol.asyncIterator || "@@asyncIterator", toStringTagSymbol = $Symbol.toStringTag || "@@toStringTag"; function define(obj, key, value) { return Object.defineProperty(obj, key, { value: value, enumerable: !0, configurable: !0, writable: !0 }), obj[key]; } try { define({}, ""); } catch (err) { define = function define(obj, key, value) { return obj[key] = value; }; } function wrap(innerFn, outerFn, self, tryLocsList) { var protoGenerator = outerFn && outerFn.prototype instanceof Generator ? outerFn : Generator, generator = Object.create(protoGenerator.prototype), context = new Context(tryLocsList || []); return defineProperty(generator, "_invoke", { value: makeInvokeMethod(innerFn, self, context) }), generator; } function tryCatch(fn, obj, arg) { try { return { type: "normal", arg: fn.call(obj, arg) }; } catch (err) { return { type: "throw", arg: err }; } } exports.wrap = wrap; var ContinueSentinel = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var IteratorPrototype = {}; define(IteratorPrototype, iteratorSymbol, function () { return this; }); var getProto = Object.getPrototypeOf, NativeIteratorPrototype = getProto && getProto(getProto(values([]))); NativeIteratorPrototype && NativeIteratorPrototype !== Op && hasOwn.call(NativeIteratorPrototype, iteratorSymbol) && (IteratorPrototype = NativeIteratorPrototype); var Gp = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(IteratorPrototype); function defineIteratorMethods(prototype) { ["next", "throw", "return"].forEach(function (method) { define(prototype, method, function (arg) { return this._invoke(method, arg); }); }); } function AsyncIterator(generator, PromiseImpl) { function invoke(method, arg, resolve, reject) { var record = tryCatch(generator[method], generator, arg); if ("throw" !== record.type) { var result = record.arg, value = result.value; return value && "object" == _typeof(value) && hasOwn.call(value, "__await") ? PromiseImpl.resolve(value.__await).then(function (value) { invoke("next", value, resolve, reject); }, function (err) { invoke("throw", err, resolve, reject); }) : PromiseImpl.resolve(value).then(function (unwrapped) { result.value = unwrapped, resolve(result); }, function (error) { return invoke("throw", error, resolve, reject); }); } reject(record.arg); } var previousPromise; defineProperty(this, "_invoke", { value: function value(method, arg) { function callInvokeWithMethodAndArg() { return new PromiseImpl(function (resolve, reject) { invoke(method, arg, resolve, reject); }); } return previousPromise = previousPromise ? previousPromise.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(innerFn, self, context) { var state = "suspendedStart"; return function (method, arg) { if ("executing" === state) throw new Error("Generator is already running"); if ("completed" === state) { if ("throw" === method) throw arg; return doneResult(); } for (context.method = method, context.arg = arg;;) { var delegate = context.delegate; if (delegate) { var delegateResult = maybeInvokeDelegate(delegate, context); if (delegateResult) { if (delegateResult === ContinueSentinel) continue; return delegateResult; } } if ("next" === context.method) context.sent = context._sent = context.arg;else if ("throw" === context.method) { if ("suspendedStart" === state) throw state = "completed", context.arg; context.dispatchException(context.arg); } else "return" === context.method && context.abrupt("return", context.arg); state = "executing"; var record = tryCatch(innerFn, self, context); if ("normal" === record.type) { if (state = context.done ? "completed" : "suspendedYield", record.arg === ContinueSentinel) continue; return { value: record.arg, done: context.done }; } "throw" === record.type && (state = "completed", context.method = "throw", context.arg = record.arg); } }; } function maybeInvokeDelegate(delegate, context) { var methodName = context.method, method = delegate.iterator[methodName]; if (undefined === method) return context.delegate = null, "throw" === methodName && delegate.iterator["return"] && (context.method = "return", context.arg = undefined, maybeInvokeDelegate(delegate, context), "throw" === context.method) || "return" !== methodName && (context.method = "throw", context.arg = new TypeError("The iterator does not provide a '" + methodName + "' method")), ContinueSentinel; var record = tryCatch(method, delegate.iterator, context.arg); if ("throw" === record.type) return context.method = "throw", context.arg = record.arg, context.delegate = null, ContinueSentinel; var info = record.arg; return info ? info.done ? (context[delegate.resultName] = info.value, context.next = delegate.nextLoc, "return" !== context.method && (context.method = "next", context.arg = undefined), context.delegate = null, ContinueSentinel) : info : (context.method = "throw", context.arg = new TypeError("iterator result is not an object"), context.delegate = null, ContinueSentinel); } function pushTryEntry(locs) { var entry = { tryLoc: locs[0] }; 1 in locs && (entry.catchLoc = locs[1]), 2 in locs && (entry.finallyLoc = locs[2], entry.afterLoc = locs[3]), this.tryEntries.push(entry); } function resetTryEntry(entry) { var record = entry.completion || {}; record.type = "normal", delete record.arg, entry.completion = record; } function Context(tryLocsList) { this.tryEntries = [{ tryLoc: "root" }], tryLocsList.forEach(pushTryEntry, this), this.reset(!0); } function values(iterable) { if (iterable) { var iteratorMethod = iterable[iteratorSymbol]; if (iteratorMethod) return iteratorMethod.call(iterable); if ("function" == typeof iterable.next) return iterable; if (!isNaN(iterable.length)) { var i = -1, next = function next() { for (; ++i < iterable.length;) if (hasOwn.call(iterable, i)) return next.value = iterable[i], next.done = !1, next; return next.value = undefined, next.done = !0, next; }; return next.next = next; } } return { next: doneResult }; } function doneResult() { return { value: undefined, done: !0 }; } return GeneratorFunction.prototype = GeneratorFunctionPrototype, defineProperty(Gp, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), defineProperty(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, toStringTagSymbol, "GeneratorFunction"), exports.isGeneratorFunction = function (genFun) { var ctor = "function" == typeof genFun && genFun.constructor; return !!ctor && (ctor === GeneratorFunction || "GeneratorFunction" === (ctor.displayName || ctor.name)); }, exports.mark = function (genFun) { return Object.setPrototypeOf ? Object.setPrototypeOf(genFun, GeneratorFunctionPrototype) : (genFun.__proto__ = GeneratorFunctionPrototype, define(genFun, toStringTagSymbol, "GeneratorFunction")), genFun.prototype = Object.create(Gp), genFun; }, exports.awrap = function (arg) { return { __await: arg }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, asyncIteratorSymbol, function () { return this; }), exports.AsyncIterator = AsyncIterator, exports.async = function (innerFn, outerFn, self, tryLocsList, PromiseImpl) { void 0 === PromiseImpl && (PromiseImpl = Promise); var iter = new AsyncIterator(wrap(innerFn, outerFn, self, tryLocsList), PromiseImpl); return exports.isGeneratorFunction(outerFn) ? iter : iter.next().then(function (result) { return result.done ? result.value : iter.next(); }); }, defineIteratorMethods(Gp), define(Gp, toStringTagSymbol, "Generator"), define(Gp, iteratorSymbol, function () { return this; }), define(Gp, "toString", function () { return "[object Generator]"; }), exports.keys = function (val) { var object = Object(val), keys = []; for (var key in object) keys.push(key); return keys.reverse(), function next() { for (; keys.length;) { var key = keys.pop(); if (key in object) return next.value = key, next.done = !1, next; } return next.done = !0, next; }; }, exports.values = values, Context.prototype = { constructor: Context, reset: function reset(skipTempReset) { if (this.prev = 0, this.next = 0, this.sent = this._sent = undefined, this.done = !1, this.delegate = null, this.method = "next", this.arg = undefined, this.tryEntries.forEach(resetTryEntry), !skipTempReset) for (var name in this) "t" === name.charAt(0) && hasOwn.call(this, name) && !isNaN(+name.slice(1)) && (this[name] = undefined); }, stop: function stop() { this.done = !0; var rootRecord = this.tryEntries[0].completion; if ("throw" === rootRecord.type) throw rootRecord.arg; return this.rval; }, dispatchException: function dispatchException(exception) { if (this.done) throw exception; var context = this; function handle(loc, caught) { return record.type = "throw", record.arg = exception, context.next = loc, caught && (context.method = "next", context.arg = undefined), !!caught; } for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i], record = entry.completion; if ("root" === entry.tryLoc) return handle("end"); if (entry.tryLoc <= this.prev) { var hasCatch = hasOwn.call(entry, "catchLoc"), hasFinally = hasOwn.call(entry, "finallyLoc"); if (hasCatch && hasFinally) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } else if (hasCatch) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); } else { if (!hasFinally) throw new Error("try statement without catch or finally"); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } } } }, abrupt: function abrupt(type, arg) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc <= this.prev && hasOwn.call(entry, "finallyLoc") && this.prev < entry.finallyLoc) { var finallyEntry = entry; break; } } finallyEntry && ("break" === type || "continue" === type) && finallyEntry.tryLoc <= arg && arg <= finallyEntry.finallyLoc && (finallyEntry = null); var record = finallyEntry ? finallyEntry.completion : {}; return record.type = type, record.arg = arg, finallyEntry ? (this.method = "next", this.next = finallyEntry.finallyLoc, ContinueSentinel) : this.complete(record); }, complete: function complete(record, afterLoc) { if ("throw" === record.type) throw record.arg; return "break" === record.type || "continue" === record.type ? this.next = record.arg : "return" === record.type ? (this.rval = this.arg = record.arg, this.method = "return", this.next = "end") : "normal" === record.type && afterLoc && (this.next = afterLoc), ContinueSentinel; }, finish: function finish(finallyLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.finallyLoc === finallyLoc) return this.complete(entry.completion, entry.afterLoc), resetTryEntry(entry), ContinueSentinel; } }, "catch": function _catch(tryLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc === tryLoc) { var record = entry.completion; if ("throw" === record.type) { var thrown = record.arg; resetTryEntry(entry); } return thrown; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(iterable, resultName, nextLoc) { return this.delegate = { iterator: values(iterable), resultName: resultName, nextLoc: nextLoc }, "next" === this.method && (this.arg = undefined), ContinueSentinel; } }, exports; }
+function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
+function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
 var context = describe;
 var server = (0, _node.setupServer)();
 beforeAll(function () {
@@ -41,14 +46,12 @@ describe("tree.click", function () {
     });
   });
   it("fires tree.click", function () {
-    return new Promise(function (done) {
-      given.$tree.on("tree.click", function (e) {
-        var treeClickEvent = e;
-        expect(treeClickEvent.node).toBe(given.node1);
-        done();
-      });
-      given.titleSpan.trigger("click");
-    });
+    var onClick = jest.fn();
+    given.$tree.on("tree.click", onClick);
+    given.titleSpan.trigger("click");
+    expect(onClick).toHaveBeenCalledWith(expect.objectContaining({
+      node: given.node1
+    }));
   });
 });
 describe("tree.contextmenu", function () {
@@ -68,14 +71,12 @@ describe("tree.contextmenu", function () {
     });
   });
   it("fires tree.contextmenu", function () {
-    return new Promise(function (done) {
-      given.$tree.on("tree.contextmenu", function (e) {
-        var treeClickEvent = e;
-        expect(treeClickEvent.node).toBe(given.node1);
-        done();
-      });
-      given.titleSpan.contextmenu();
-    });
+    var onContextMenu = jest.fn();
+    given.$tree.on("tree.contextmenu", onContextMenu);
+    given.titleSpan.trigger("contextmenu");
+    expect(onContextMenu).toHaveBeenCalledWith(expect.objectContaining({
+      node: given.node1
+    }));
   });
 });
 describe("tree.dblclick", function () {
@@ -95,14 +96,12 @@ describe("tree.dblclick", function () {
     });
   });
   it("fires tree.dblclick", function () {
-    return new Promise(function (done) {
-      given.$tree.on("tree.dblclick", function (e) {
-        var treeClickEvent = e;
-        expect(treeClickEvent.node).toBe(given.node1);
-        done();
-      });
-      given.titleSpan.trigger("dblclick");
-    });
+    var onDoubleClick = jest.fn();
+    given.$tree.on("tree.dblclick", onDoubleClick);
+    given.titleSpan.trigger("dblclick");
+    expect(onDoubleClick).toHaveBeenCalledWith(expect.objectContaining({
+      node: given.node1
+    }));
   });
 });
 describe("tree.init", function () {
@@ -112,18 +111,14 @@ describe("tree.init", function () {
   });
   context("with json data", function () {
     it("is called", function () {
-      return new Promise(function (done) {
-        given.$tree.on("tree.init", function () {
-          expect(given.$tree.tree("getNodeByName", "node2")).toMatchObject({
-            id: 124,
-            name: "node2"
-          });
-          done();
-        });
-        given.$tree.tree({
-          data: _exampleData["default"]
-        });
+      var onInit = jest.fn();
+      given.$tree.on("tree.init", onInit);
+      given.$tree.tree({
+        data: _exampleData["default"]
       });
+
+      // eslint-disable-next-line jest/prefer-called-with
+      expect(onInit).toHaveBeenCalled();
     });
   });
   context("with data loaded from an url", function () {
@@ -132,20 +127,27 @@ describe("tree.init", function () {
         return response(ctx.status(200), ctx.json(_exampleData["default"]));
       }));
     });
-    it("is called", function () {
-      return new Promise(function (done) {
-        given.$tree.on("tree.init", function () {
-          expect(given.$tree.tree("getNodeByName", "node2")).toMatchObject({
-            id: 124,
-            name: "node2"
-          });
-          done();
-        });
-        given.$tree.tree({
-          dataUrl: "/tree/"
-        });
-      });
-    });
+    it("is called", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+      var onInit;
+      return _regeneratorRuntime().wrap(function _callee$(_context) {
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            onInit = jest.fn();
+            given.$tree.on("tree.init", onInit);
+            given.$tree.tree({
+              dataUrl: "/tree/"
+            });
+            _context.next = 5;
+            return (0, _dom.waitFor)(function () {
+              // eslint-disable-next-line jest/prefer-called-with
+              expect(onInit).toHaveBeenCalled();
+            });
+          case 5:
+          case "end":
+            return _context.stop();
+        }
+      }, _callee);
+    })));
   });
 });
 describe("tree.load_data", function () {
@@ -155,16 +157,14 @@ describe("tree.load_data", function () {
   });
   context("when the tree is initialized with data", function () {
     it("fires tree.load_data", function () {
-      return new Promise(function (resolve) {
-        given.$tree.on("tree.load_data", function (e) {
-          // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
-          expect(e.tree_data).toEqual(_exampleData["default"]);
-          resolve();
-        });
-        given.$tree.tree({
-          data: _exampleData["default"]
-        });
+      var onLoadData = jest.fn();
+      given.$tree.on("tree.load_data", onLoadData);
+      given.$tree.tree({
+        data: _exampleData["default"]
       });
+      expect(onLoadData).toHaveBeenCalledWith(expect.objectContaining({
+        tree_data: _exampleData["default"]
+      }));
     });
   });
 });
@@ -184,31 +184,27 @@ describe("tree.select", function () {
       data: _exampleData["default"]
     });
   });
-  it("fires tree.click", function () {
-    return new Promise(function (done) {
-      given.$tree.on("tree.select", function (e) {
-        var treeClickEvent = e;
-        expect(treeClickEvent.node).toBe(given.node1);
-        expect(treeClickEvent.deselected_node).toBeNull();
-        done();
-      });
-      given.titleSpan.trigger("click");
-    });
+  it("fires tree.select", function () {
+    var onSelect = jest.fn();
+    given.$tree.on("tree.select", onSelect);
+    given.titleSpan.trigger("click");
+    expect(onSelect).toHaveBeenCalledWith(expect.objectContaining({
+      node: given.node1,
+      deselected_node: null
+    }));
   });
   context("when the node was selected", function () {
     beforeEach(function () {
       given.$tree.tree("selectNode", given.node1);
     });
     it("fires tree.select with node is null", function () {
-      return new Promise(function (done) {
-        given.$tree.on("tree.select", function (e) {
-          var treeClickEvent = e;
-          expect(treeClickEvent.node).toBeNull();
-          expect(treeClickEvent.previous_node).toBe(given.node1);
-          done();
-        });
-        given.titleSpan.trigger("click");
-      });
+      var onSelect = jest.fn();
+      given.$tree.on("tree.select", onSelect);
+      given.titleSpan.trigger("click");
+      expect(onSelect).toHaveBeenCalledWith(expect.objectContaining({
+        node: null,
+        previous_node: given.node1
+      }));
     });
   });
 });

package/lib/test/node.test.js

@@ -151,7 +151,8 @@ describe("addChild", function () {
     })]));
   });
   it("sets the parent of the child", function () {
-    expect(given.node.children[0].parent).toEqual(given.node);
+    var _given$node$children$;
+    expect((_given$node$children$ = given.node.children[0]) === null || _given$node$children$ === void 0 ? void 0 : _given$node$children$.parent).toEqual(given.node);
   });
 });
 describe("addChildAtPosition", function () {
@@ -486,13 +487,15 @@ describe("getLastChild", function () {
     context("when its last child is open and has children", function () {
       beforeEach(function () {
         var child2 = given.node.children[1];
-        child2.append("child2a");
-        child2.append("child2b");
+        child2 === null || child2 === void 0 ? void 0 : child2.append("child2a");
+        child2 === null || child2 === void 0 ? void 0 : child2.append("child2b");
       });
       context("and the last child is open", function () {
         beforeEach(function () {
           var child2 = given.node.children[1];
-          child2.is_open = true;
+          if (child2) {
+            child2.is_open = true;
+          }
         });
         it("returns the last child of that child", function () {
           expect(given.node.getLastChild()).toMatchObject({

package/lib/version.js

@@ -4,6 +4,6 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports["default"] = void 0;
-var version = "1.7.0";
+var version = "1.7.1";
 var _default = version;
 exports["default"] = _default;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "jqtree",
-    "version": "1.7.0",
+    "version": "1.7.1",
     "description": "Tree widget for jQuery",
     "keywords": [
         "jquery-plugin",
@@ -23,60 +23,56 @@
         "devserver-with-coverage": "COVERAGE=true SERVE=true rollup --config config/rollup.config.mjs",
         "build-with-coverage": "COVERAGE=true rollup --config config/rollup.config.mjs",
         "prettier": "prettier src/*.ts --write --tab-width 4",
-        "write-coverage": "nyc report --reporter=text-lcov > lcov.info",
         "tsc": "tsc --noEmit --project tsconfig.json",
-        "merge-coverage": "cp jest-coverage/coverage-final.json .nyc_output/coverage_jsdom.json",
-        "clean-coverage": "rm -rf .nyc_output && jest --clearCache",
-        "print-coverage": "nyc report",
         "playwright": "pnpm build-with-coverage && playwright test --config config/playwright.config.js",
         "test": "pnpm jest && pnpm playwright"
     },
     "dependencies": {
-        "jquery": "^3.6.3"
+        "jquery": "^3.7.0"
     },
     "devDependencies": {
-        "@babel/cli": "^7.20.7",
-        "@babel/core": "^7.20.7",
-        "@babel/preset-env": "^7.20.2",
-        "@babel/preset-typescript": "^7.18.6",
-        "@playwright/test": "^1.29.1",
+        "@babel/cli": "^7.22.9",
+        "@babel/core": "^7.22.9",
+        "@babel/preset-env": "^7.22.9",
+        "@babel/preset-typescript": "^7.22.5",
+        "@playwright/test": "^1.36.2",
         "@rollup/plugin-babel": "^6.0.3",
-        "@rollup/plugin-node-resolve": "^15.0.1",
-        "@rollup/plugin-terser": "^0.1.0",
-        "@testing-library/dom": "^8.19.0",
-        "@types/debug": "^4.1.7",
-        "@types/jest": "^29.2.4",
-        "@types/jquery": "^3.5.14",
-        "@types/node": "^18.11.17",
-        "@typescript-eslint/eslint-plugin": "^5.47.0",
-        "@typescript-eslint/parser": "^5.47.0",
-        "autoprefixer": "^10.4.13",
-        "babel-jest": "^29.3.1",
+        "@rollup/plugin-node-resolve": "^15.1.0",
+        "@rollup/plugin-terser": "^0.4.3",
+        "@testing-library/dom": "^9.3.1",
+        "@types/debug": "^4.1.8",
+        "@types/jest": "^29.5.3",
+        "@types/jest-axe": "^3.5.5",
+        "@types/jquery": "^3.5.16",
+        "@types/node": "^20.4.7",
+        "@typescript-eslint/eslint-plugin": "^6.2.1",
+        "@typescript-eslint/parser": "^6.2.1",
+        "autoprefixer": "^10.4.14",
+        "babel-jest": "^29.6.2",
         "babel-plugin-istanbul": "^6.1.1",
-        "eslint": "^8.30.0",
-        "eslint-plugin-import": "^2.26.0",
-        "eslint-plugin-jest": "^27.1.7",
-        "eslint-plugin-playwright": "^0.11.2",
-        "eslint-plugin-testing-library": "^5.9.1",
+        "eslint": "^8.46.0",
+        "eslint-plugin-import": "^2.28.0",
+        "eslint-plugin-jest": "^27.2.3",
+        "eslint-plugin-playwright": "^0.15.3",
+        "eslint-plugin-testing-library": "^5.11.0",
         "givens": "^1.3.9",
-        "graphql": "^16.6.0",
-        "jest": "^29.3.1",
-        "jest-environment-jsdom": "^29.3.1",
-        "jest-extended": "^3.2.0",
+        "graphql": "^16.7.1",
+        "jest": "^29.6.2",
+        "jest-axe": "^8.0.0",
+        "jest-environment-jsdom": "^29.6.2",
+        "jest-extended": "^4.0.1",
         "jsonfile": "^6.1.0",
         "lodash.template": "^4.5.0",
-        "msw": "^0.49.2",
-        "nyc": "^15.1.0",
-        "playwright": "^1.29.1",
-        "postcss": "^8.4.20",
+        "msw": "^1.2.3",
+        "postcss": "^8.4.27",
         "postcss-cli": "^10.1.0",
         "postcss-import": "^15.1.0",
         "postcss-load-config": "^4.0.1",
-        "postcss-nested": "^6.0.0",
-        "prettier": "^2.8.1",
-        "rollup": "^3.8.1",
+        "postcss-nested": "^6.0.1",
+        "prettier": "^3.0.1",
+        "rollup": "^3.27.2",
         "rollup-plugin-serve": "^2.0.2",
-        "tslib": "^2.4.1",
-        "typescript": "~4.9.4"
+        "tslib": "^2.6.1",
+        "typescript": "~5.1.6"
     }
 }