Autoscroll issue (#738)

* Dnd: top of the first area is the top of the first node. * Wip * Wip * Wip * Handle document scrolling when the tree is in a container * Horizontal scrolling * Wip * Remove console log * Prevent scrolling outside of the original scroll area * Build * Test wip * Test wip * Remove todo * Set argsIgnorePattern; add test * Reset scrollParentTop * Build * Rename to createScrollParent * Refactor mock$JQueryElement * Implement getScrollLeft * Add test for autoscroll * Lint * Add test * Add test * Lint * Add test * Remove document scroll parent from container scroll parent * Remove jest test for scroll parent * Remove isScrolledIntoView * Add test * Build * Changelog
mbraak · Sep 30, 2023 · 7135d32 · 7135d32
1 parent 7773be3
commit 7135d32
Show file tree

Hide file tree

Showing 32 changed files with 2,142 additions and 888 deletions.
diff --git a/.eslintrc b/.eslintrc
@@ -15,6 +15,10 @@
         "@typescript-eslint/interface-name-prefix": "off",
         "@typescript-eslint/no-explicit-any": "off",
         "@typescript-eslint/no-use-before-define": "off",
+        "@typescript-eslint/no-unused-vars": ["error", {
+            "argsIgnorePattern": "^_",
+            "varsIgnorePattern": "^_"
+        }],
         "@typescript-eslint/prefer-includes": "off",
         "@typescript-eslint/triple-slash-reference": "off",
         "@typescript-eslint/prefer-string-starts-ends-with": "off",
@@ -29,6 +33,6 @@
         ]
     },
     "parserOptions": {
-        "project": "./tsconfig.json"
+        "project": "./tsconfig.json",
     }
 }
diff --git a/docs/_entries/general/changelog.md b/docs/_entries/general/changelog.md
@@ -3,6 +3,10 @@ title: Changelog
 name: changelog
 ---
 
+#### Development version
+
+-   Issue #734: fix autoscroll issue (thanks to WriterStat)
+
 #### 1.7.4 (september 24 2023)
 
 -   Issue #675: support toggler on the right with multiline (thanks to Odungern)

diff --git a/lib/dragAndDropHandler.js b/lib/dragAndDropHandler.js
@@ -29,7 +29,6 @@ var DragAndDropHandler = /*#__PURE__*/function () {
     _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);
@@ -39,7 +38,6 @@ var DragAndDropHandler = /*#__PURE__*/function () {
     this.hitAreas = [];
     this.isDragging = false;
     this.currentItem = null;
-    this.positionInfo = null;
   }
   _createClass(DragAndDropHandler, [{
     key: "mouseCapture",
@@ -74,7 +72,6 @@ var DragAndDropHandler = /*#__PURE__*/function () {
       var node = this.currentItem.node;
       this.dragElement = new DragElement(node.name, positionInfo.pageX - left, positionInfo.pageY - top, this.treeWidget.element, (_this$treeWidget$opti = this.treeWidget.options.autoEscape) !== null && _this$treeWidget$opti !== void 0 ? _this$treeWidget$opti : true);
       this.isDragging = true;
-      this.positionInfo = positionInfo;
       this.currentItem.$element.addClass("jqtree-moving");
       return true;
     }
@@ -85,7 +82,6 @@ var DragAndDropHandler = /*#__PURE__*/function () {
         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()) {
@@ -128,7 +124,6 @@ var DragAndDropHandler = /*#__PURE__*/function () {
         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);
@@ -415,7 +410,8 @@ var HitAreasGenerator = /*#__PURE__*/function (_VisibleNodeIterator) {
   }, {
     key: "generateHitAreas",
     value: function generateHitAreas(positions) {
-      var previousTop = -1;
+      var _positions$0$top, _positions$;
+      var previousTop = (_positions$0$top = (_positions$ = positions[0]) === null || _positions$ === void 0 ? void 0 : _positions$.top) !== null && _positions$0$top !== void 0 ? _positions$0$top : 0;
       var group = [];
       var hitAreas = [];
       var _iterator = _createForOfIteratorHelper(positions),
@@ -424,9 +420,7 @@ var HitAreasGenerator = /*#__PURE__*/function (_VisibleNodeIterator) {
         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);
-            }
+            this.generateHitAreasForGroup(hitAreas, group, previousTop, position.top);
             previousTop = position.top;
             group = [];
           }

diff --git a/lib/keyHandler.js b/lib/keyHandler.js
@@ -94,9 +94,6 @@ var KeyHandler = /*#__PURE__*/function () {
         return true;
       } else {
         this.treeWidget.selectNode(node);
-        if (!this.treeWidget.scrollHandler.isScrolledIntoView(jQuery(node.element).find(".jqtree-element"))) {
-          this.treeWidget.scrollToNode(node);
-        }
         return false;
       }
     }

diff --git a/lib/playwright/playwright.test.js b/lib/playwright/playwright.test.js
diff --git a/lib/playwright/testUtils.js b/lib/playwright/testUtils.js
@@ -4,8 +4,8 @@ function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" ==
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.selectNode = exports.getTreeStructure = exports.findNodeElement = exports.dragAndDrop = void 0;
-var _ref, _ref2, _ref3, _ref4, _ref5, _ref6;
+exports.selectNode = exports.moveMouseToNode = exports.getTreeStructure = exports.findNodeElement = exports.dragAndDrop = void 0;
+var _ref, _ref2, _ref3, _ref4, _ref5, _ref6, _ref7;
 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 e; }; var t, e = {}, r = Object.prototype, n = r.hasOwnProperty, o = Object.defineProperty || function (t, e, r) { t[e] = r.value; }, i = "function" == typeof Symbol ? Symbol : {}, a = i.iterator || "@@iterator", c = i.asyncIterator || "@@asyncIterator", u = i.toStringTag || "@@toStringTag"; function define(t, e, r) { return Object.defineProperty(t, e, { value: r, enumerable: !0, configurable: !0, writable: !0 }), t[e]; } try { define({}, ""); } catch (t) { define = function define(t, e, r) { return t[e] = r; }; } function wrap(t, e, r, n) { var i = e && e.prototype instanceof Generator ? e : Generator, a = Object.create(i.prototype), c = new Context(n || []); return o(a, "_invoke", { value: makeInvokeMethod(t, r, c) }), a; } function tryCatch(t, e, r) { try { return { type: "normal", arg: t.call(e, r) }; } catch (t) { return { type: "throw", arg: t }; } } e.wrap = wrap; var h = "suspendedStart", l = "suspendedYield", f = "executing", s = "completed", y = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var p = {}; define(p, a, function () { return this; }); var d = Object.getPrototypeOf, v = d && d(d(values([]))); v && v !== r && n.call(v, a) && (p = v); var g = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(p); function defineIteratorMethods(t) { ["next", "throw", "return"].forEach(function (e) { define(t, e, function (t) { return this._invoke(e, t); }); }); } function AsyncIterator(t, e) { function invoke(r, o, i, a) { var c = tryCatch(t[r], t, o); if ("throw" !== c.type) { var u = c.arg, h = u.value; return h && "object" == _typeof(h) && n.call(h, "__await") ? e.resolve(h.__await).then(function (t) { invoke("next", t, i, a); }, function (t) { invoke("throw", t, i, a); }) : e.resolve(h).then(function (t) { u.value = t, i(u); }, function (t) { return invoke("throw", t, i, a); }); } a(c.arg); } var r; o(this, "_invoke", { value: function value(t, n) { function callInvokeWithMethodAndArg() { return new e(function (e, r) { invoke(t, n, e, r); }); } return r = r ? r.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(e, r, n) { var o = h; return function (i, a) { if (o === f) throw new Error("Generator is already running"); if (o === s) { if ("throw" === i) throw a; return { value: t, done: !0 }; } for (n.method = i, n.arg = a;;) { var c = n.delegate; if (c) { var u = maybeInvokeDelegate(c, n); if (u) { if (u === y) continue; return u; } } if ("next" === n.method) n.sent = n._sent = n.arg;else if ("throw" === n.method) { if (o === h) throw o = s, n.arg; n.dispatchException(n.arg); } else "return" === n.method && n.abrupt("return", n.arg); o = f; var p = tryCatch(e, r, n); if ("normal" === p.type) { if (o = n.done ? s : l, p.arg === y) continue; return { value: p.arg, done: n.done }; } "throw" === p.type && (o = s, n.method = "throw", n.arg = p.arg); } }; } function maybeInvokeDelegate(e, r) { var n = r.method, o = e.iterator[n]; if (o === t) return r.delegate = null, "throw" === n && e.iterator["return"] && (r.method = "return", r.arg = t, maybeInvokeDelegate(e, r), "throw" === r.method) || "return" !== n && (r.method = "throw", r.arg = new TypeError("The iterator does not provide a '" + n + "' method")), y; var i = tryCatch(o, e.iterator, r.arg); if ("throw" === i.type) return r.method = "throw", r.arg = i.arg, r.delegate = null, y; var a = i.arg; return a ? a.done ? (r[e.resultName] = a.value, r.next = e.nextLoc, "return" !== r.method && (r.method = "next", r.arg = t), r.delegate = null, y) : a : (r.method = "throw", r.arg = new TypeError("iterator result is not an object"), r.delegate = null, y); } function pushTryEntry(t) { var e = { tryLoc: t[0] }; 1 in t && (e.catchLoc = t[1]), 2 in t && (e.finallyLoc = t[2], e.afterLoc = t[3]), this.tryEntries.push(e); } function resetTryEntry(t) { var e = t.completion || {}; e.type = "normal", delete e.arg, t.completion = e; } function Context(t) { this.tryEntries = [{ tryLoc: "root" }], t.forEach(pushTryEntry, this), this.reset(!0); } function values(e) { if (e || "" === e) { var r = e[a]; if (r) return r.call(e); if ("function" == typeof e.next) return e; if (!isNaN(e.length)) { var o = -1, i = function next() { for (; ++o < e.length;) if (n.call(e, o)) return next.value = e[o], next.done = !1, next; return next.value = t, next.done = !0, next; }; return i.next = i; } } throw new TypeError(_typeof(e) + " is not iterable"); } return GeneratorFunction.prototype = GeneratorFunctionPrototype, o(g, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), o(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, u, "GeneratorFunction"), e.isGeneratorFunction = function (t) { var e = "function" == typeof t && t.constructor; return !!e && (e === GeneratorFunction || "GeneratorFunction" === (e.displayName || e.name)); }, e.mark = function (t) { return Object.setPrototypeOf ? Object.setPrototypeOf(t, GeneratorFunctionPrototype) : (t.__proto__ = GeneratorFunctionPrototype, define(t, u, "GeneratorFunction")), t.prototype = Object.create(g), t; }, e.awrap = function (t) { return { __await: t }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, c, function () { return this; }), e.AsyncIterator = AsyncIterator, e.async = function (t, r, n, o, i) { void 0 === i && (i = Promise); var a = new AsyncIterator(wrap(t, r, n, o), i); return e.isGeneratorFunction(r) ? a : a.next().then(function (t) { return t.done ? t.value : a.next(); }); }, defineIteratorMethods(g), define(g, u, "Generator"), define(g, a, function () { return this; }), define(g, "toString", function () { return "[object Generator]"; }), e.keys = function (t) { var e = Object(t), r = []; for (var n in e) r.push(n); return r.reverse(), function next() { for (; r.length;) { var t = r.pop(); if (t in e) return next.value = t, next.done = !1, next; } return next.done = !0, next; }; }, e.values = values, Context.prototype = { constructor: Context, reset: function reset(e) { if (this.prev = 0, this.next = 0, this.sent = this._sent = t, this.done = !1, this.delegate = null, this.method = "next", this.arg = t, this.tryEntries.forEach(resetTryEntry), !e) for (var r in this) "t" === r.charAt(0) && n.call(this, r) && !isNaN(+r.slice(1)) && (this[r] = t); }, stop: function stop() { this.done = !0; var t = this.tryEntries[0].completion; if ("throw" === t.type) throw t.arg; return this.rval; }, dispatchException: function dispatchException(e) { if (this.done) throw e; var r = this; function handle(n, o) { return a.type = "throw", a.arg = e, r.next = n, o && (r.method = "next", r.arg = t), !!o; } for (var o = this.tryEntries.length - 1; o >= 0; --o) { var i = this.tryEntries[o], a = i.completion; if ("root" === i.tryLoc) return handle("end"); if (i.tryLoc <= this.prev) { var c = n.call(i, "catchLoc"), u = n.call(i, "finallyLoc"); if (c && u) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } else if (c) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); } else { if (!u) throw new Error("try statement without catch or finally"); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } } } }, abrupt: function abrupt(t, e) { for (var r = this.tryEntries.length - 1; r >= 0; --r) { var o = this.tryEntries[r]; if (o.tryLoc <= this.prev && n.call(o, "finallyLoc") && this.prev < o.finallyLoc) { var i = o; break; } } i && ("break" === t || "continue" === t) && i.tryLoc <= e && e <= i.finallyLoc && (i = null); var a = i ? i.completion : {}; return a.type = t, a.arg = e, i ? (this.method = "next", this.next = i.finallyLoc, y) : this.complete(a); }, complete: function complete(t, e) { if ("throw" === t.type) throw t.arg; return "break" === t.type || "continue" === t.type ? this.next = t.arg : "return" === t.type ? (this.rval = this.arg = t.arg, this.method = "return", this.next = "end") : "normal" === t.type && e && (this.next = e), y; }, finish: function finish(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.finallyLoc === t) return this.complete(r.completion, r.afterLoc), resetTryEntry(r), y; } }, "catch": function _catch(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.tryLoc === t) { var n = r.completion; if ("throw" === n.type) { var o = n.arg; resetTryEntry(r); } return o; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(e, r, n) { return this.delegate = { iterator: values(e), resultName: r, nextLoc: n }, "next" === this.method && (this.arg = t), y; } }, e; }
 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); }); }; }
@@ -146,39 +146,50 @@ var getNodeRect = function getNodeRect(_x6, _x7) {
     }, _callee5);
   }))).apply(this, arguments);
 };
-var dragAndDrop = function dragAndDrop(_x8, _x9, _x10) {
-  return (_ref6 = _ref6 || _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(page, from, to) {
-    var fromRect, toRect;
+var moveMouseToNode = function moveMouseToNode(_x8, _x9) {
+  return (_ref6 = _ref6 || _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(page, title) {
+    var rect;
     return _regeneratorRuntime().wrap(function _callee6$(_context6) {
       while (1) switch (_context6.prev = _context6.next) {
         case 0:
           _context6.next = 2;
-          return getNodeRect(page, from);
+          return getNodeRect(page, title);
         case 2:
-          fromRect = _context6.sent;
+          rect = _context6.sent;
           _context6.next = 5;
-          return getNodeRect(page, to);
+          return page.mouse.move(rect.x + 10, rect.y + rect.height / 2);
         case 5:
-          toRect = _context6.sent;
-          _context6.next = 8;
-          return page.mouse.move(fromRect.x + fromRect.width / 2, fromRect.y + fromRect.height / 2);
-        case 8:
-          _context6.next = 10;
+        case "end":
+          return _context6.stop();
+      }
+    }, _callee6);
+  }))).apply(this, arguments);
+};
+exports.moveMouseToNode = moveMouseToNode;
+var dragAndDrop = function dragAndDrop(_x10, _x11, _x12) {
+  return (_ref7 = _ref7 || _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7(page, fromTitle, toTitle) {
+    return _regeneratorRuntime().wrap(function _callee7$(_context7) {
+      while (1) switch (_context7.prev = _context7.next) {
+        case 0:
+          _context7.next = 2;
+          return moveMouseToNode(page, fromTitle);
+        case 2:
+          _context7.next = 4;
           return page.mouse.down();
-        case 10:
-          _context6.next = 12;
+        case 4:
+          _context7.next = 6;
           return page.waitForTimeout(200);
-        case 12:
-          _context6.next = 14;
-          return page.mouse.move(toRect.x + toRect.width / 2, toRect.y + toRect.height / 2);
-        case 14:
-          _context6.next = 16;
+        case 6:
+          _context7.next = 8;
+          return moveMouseToNode(page, toTitle);
+        case 8:
+          _context7.next = 10;
           return page.mouse.up();
-        case 16:
+        case 10:
         case "end":
-          return _context6.stop();
+          return _context7.stop();
       }
-    }, _callee6);
+    }, _callee7);
   }))).apply(this, arguments);
 };
 exports.dragAndDrop = dragAndDrop;