targetj 1.1.0 → 1.1.2

package/build/TModelUtil.js

@@ -2,16 +2,16 @@ function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" ==
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
+function _toConsumableArray(r) { return _arrayWithoutHoles(r) || _iterableToArray(r) || _unsupportedIterableToArray(r) || _nonIterableSpread(); }
+function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _iterableToArray(r) { if ("undefined" != typeof Symbol && null != r[Symbol.iterator] || null != r["@@iterator"]) return Array.from(r); }
+function _arrayWithoutHoles(r) { if (Array.isArray(r)) return _arrayLikeToArray(r); }
 function _slicedToArray(r, e) { return _arrayWithHoles(r) || _iterableToArrayLimit(r, e) || _unsupportedIterableToArray(r, e) || _nonIterableRest(); }
 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 _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
 function _arrayWithHoles(r) { if (Array.isArray(r)) return r; }
 function _createForOfIteratorHelper(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, 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 o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t.return || t.return(); } finally { if (u) throw o; } } }; }
-function _toConsumableArray(r) { return _arrayWithoutHoles(r) || _iterableToArray(r) || _unsupportedIterableToArray(r) || _nonIterableSpread(); }
-function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
-function _iterableToArray(r) { if ("undefined" != typeof Symbol && null != r[Symbol.iterator] || null != r["@@iterator"]) return Array.from(r); }
-function _arrayWithoutHoles(r) { if (Array.isArray(r)) return _arrayLikeToArray(r); }
 function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
 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 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 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 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(n, t, e, r, o, a, c) { try { var i = n[a](c), u = i.value; } catch (n) { return void e(n); } i.done ? t(u) : Promise.resolve(u).then(r, o); }
@@ -48,15 +48,21 @@ var TModelUtil = /*#__PURE__*/function () {
               left = page.scrollLeft || 0;
               top = page.scrollTop || 0;
               window.scrollTo(left, top);
-              _context.next = 5;
-              return new Promise(requestAnimationFrame);
+              if (!(left === 0 && top === 0)) {
+                _context.next = 5;
+                break;
+              }
+              return _context.abrupt("return");
             case 5:
+              _context.next = 7;
+              return new Promise(requestAnimationFrame);
+            case 7:
               window.scrollTo(left, top);
-              _context.next = 8;
+              _context.next = 10;
               return new Promise(requestAnimationFrame);
-            case 8:
+            case 10:
               window.scrollTo(left, top);
-            case 9:
+            case 11:
             case "end":
               return _context.stop();
           }
@@ -80,57 +86,85 @@ var TModelUtil = /*#__PURE__*/function () {
   }, {
     key: "captureDomState",
     value: function captureDomState($root) {
-      if (!($root !== null && $root !== void 0 && $root.getElement())) {
+      var root = $root === null || $root === void 0 ? void 0 : $root.getElement();
+      if (!root) {
         return undefined;
       }
-      var elements = [$root.getElement()].concat(_toConsumableArray($root.queryAll("*")));
       var controls = [];
       var scrollPositions = [];
-      elements.forEach(function (element, index) {
-        var _element$tagName;
-        var tagName = (_element$tagName = element.tagName) === null || _element$tagName === void 0 ? void 0 : _element$tagName.toLowerCase();
-        if (tagName === "input") {
-          var type = (element.type || "text").toLowerCase();
-          if (type !== "file") {
+      var doc = root.ownerDocument;
+      var focusedElement = doc.activeElement;
+      var activeElement = focusedElement === doc.body || focusedElement === doc.documentElement ? null : focusedElement;
+      var walker = doc.createTreeWalker(root, NodeFilter.SHOW_ELEMENT);
+      var element = root;
+      var index = 0;
+      var controlIndex = 0;
+      var activeIndex = -1;
+      while (element) {
+        var kind = element.localName;
+        if (element === activeElement) {
+          activeIndex = index;
+        }
+        switch (kind) {
+          case "input":
+            {
+              var currentControlIndex = controlIndex++;
+              if (element.type !== "file") {
+                controls.push({
+                  index: index,
+                  controlIndex: currentControlIndex,
+                  kind: kind,
+                  value: element.value,
+                  checked: element.checked,
+                  indeterminate: element.indeterminate
+                });
+              }
+              break;
+            }
+          case "textarea":
             controls.push({
               index: index,
-              kind: "input",
-              value: element.value,
-              checked: element.checked,
-              indeterminate: element.indeterminate
+              controlIndex: controlIndex++,
+              kind: kind,
+              value: element.value
             });
-          }
-        } else if (tagName === "textarea") {
-          controls.push({
-            index: index,
-            kind: "textarea",
-            value: element.value
-          });
-        } else if (tagName === "select") {
-          controls.push({
-            index: index,
-            kind: "select",
-            selected: _toConsumableArray(element.options).map(function (option) {
-              return option.selected;
-            })
-          });
-        } else if (tagName === "details") {
-          controls.push({
-            index: index,
-            kind: "details",
-            open: element.open
-          });
+            break;
+          case "select":
+            {
+              var options = element.options;
+              var selected = new Array(options.length);
+              for (var i = 0; i < options.length; i++) {
+                selected[i] = options[i].selected;
+              }
+              controls.push({
+                index: index,
+                controlIndex: controlIndex++,
+                kind: kind,
+                selected: selected
+              });
+              break;
+            }
+          case "details":
+            controls.push({
+              index: index,
+              controlIndex: controlIndex++,
+              kind: kind,
+              open: element.open
+            });
+            break;
         }
-        if (element.scrollLeft || element.scrollTop) {
+        var scrollLeft = element.scrollLeft;
+        var scrollTop = element.scrollTop;
+        if (scrollLeft || scrollTop) {
           scrollPositions.push({
             index: index,
-            scrollLeft: element.scrollLeft,
-            scrollTop: element.scrollTop
+            scrollLeft: scrollLeft,
+            scrollTop: scrollTop
           });
         }
-      });
-      var activeElement = document.activeElement;
-      var activeIndex = activeElement && $root.contains(activeElement) ? elements.indexOf(activeElement) : -1;
+        element = walker.nextNode();
+        index++;
+      }
       var selection;
       if (activeIndex >= 0 && typeof activeElement.selectionStart === "number") {
         selection = {
@@ -149,38 +183,58 @@ var TModelUtil = /*#__PURE__*/function () {
   }, {
     key: "restoreMountedDom",
     value: function restoreMountedDom($root, domState) {
-      if (!($root !== null && $root !== void 0 && $root.getElement()) || !domState) {
+      var root = $root === null || $root === void 0 ? void 0 : $root.getElement();
+      var states = domState === null || domState === void 0 ? void 0 : domState.controls;
+      if (!root || !(states !== null && states !== void 0 && states.length)) {
         return;
       }
-      var elements = [$root.getElement()].concat(_toConsumableArray($root.queryAll("*")));
-      var _iterator = _createForOfIteratorHelper(domState.controls || []),
+      var selector = "input,textarea,select,details";
+      var offset = root.matches(selector) ? 1 : 0;
+      var elements = root.querySelectorAll(selector);
+      var _iterator = _createForOfIteratorHelper(states),
         _step;
       try {
-        var _loop = function _loop() {
-          var _element$tagName2;
+        for (_iterator.s(); !(_step = _iterator.n()).done;) {
           var state = _step.value;
-          var element = elements[state.index];
-          if (!element) {
-            return 1; // continue
+          var element = offset && state.controlIndex === 0 ? root : elements[state.controlIndex - offset];
+          if (!element || element.localName !== state.kind) {
+            continue;
           }
-          var tagName = (_element$tagName2 = element.tagName) === null || _element$tagName2 === void 0 ? void 0 : _element$tagName2.toLowerCase();
-          if (state.kind === "input" && tagName === "input") {
-            element.value = state.value;
-            element.checked = state.checked;
-            element.indeterminate = state.indeterminate;
-          } else if (state.kind === "textarea" && tagName === "textarea") {
-            element.value = state.value;
-          } else if (state.kind === "select" && tagName === "select") {
-            Array.from(element.options).forEach(function (option, index) {
-              var _state$selected;
-              option.selected = ((_state$selected = state.selected) === null || _state$selected === void 0 ? void 0 : _state$selected[index]) === true;
-            });
-          } else if (state.kind === "details" && tagName === "details") {
-            element.open = state.open;
+          switch (state.kind) {
+            case "input":
+              if (element.value !== state.value) {
+                element.value = state.value;
+              }
+              if (element.checked !== state.checked) {
+                element.checked = state.checked;
+              }
+              if (element.indeterminate !== state.indeterminate) {
+                element.indeterminate = state.indeterminate;
+              }
+              break;
+            case "textarea":
+              if (element.value !== state.value) {
+                element.value = state.value;
+              }
+              break;
+            case "select":
+              {
+                var options = element.options;
+                var selected = state.selected || [];
+                for (var i = 0; i < options.length; i++) {
+                  var value = selected[i] === true;
+                  if (options[i].selected !== value) {
+                    options[i].selected = value;
+                  }
+                }
+                break;
+              }
+            case "details":
+              if (element.open !== state.open) {
+                element.open = state.open;
+              }
+              break;
           }
-        };
-        for (_iterator.s(); !(_step = _iterator.n()).done;) {
-          if (_loop()) continue;
         }
       } catch (err) {
         _iterator.e(err);
@@ -192,77 +246,110 @@ var TModelUtil = /*#__PURE__*/function () {
     key: "restoreDomInteractionState",
     value: function () {
       var _restoreDomInteractionState = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2($root, domState) {
-        var elements, _iterator2, _step2, state, element, activeElement, _activeElement$focus;
+        var _domState$activeIndex;
+        var _ref,
+          _ref$focus,
+          focus,
+          root,
+          scrollPositions,
+          activeIndex,
+          lastScrollIndex,
+          lastIndex,
+          walker,
+          element,
+          activeElement,
+          scrollIndex,
+          index,
+          state,
+          left,
+          top,
+          tag,
+          editable,
+          _activeElement$focus,
+          _activeElement,
+          _args2 = arguments;
         return _regeneratorRuntime().wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
-              if (!(!($root !== null && $root !== void 0 && $root.getElement()) || !domState)) {
-                _context2.next = 2;
+              _ref = _args2.length > 2 && _args2[2] !== undefined ? _args2[2] : {}, _ref$focus = _ref.focus, focus = _ref$focus === void 0 ? "editable" : _ref$focus;
+              root = $root === null || $root === void 0 ? void 0 : $root.getElement();
+              if (!(!root || !domState)) {
+                _context2.next = 4;
                 break;
               }
               return _context2.abrupt("return");
-            case 2:
-              _context2.next = 4;
-              return new Promise(requestAnimationFrame);
             case 4:
-              elements = [$root.getElement()].concat(_toConsumableArray($root.queryAll("*")));
-              _iterator2 = _createForOfIteratorHelper(domState.scrollPositions || []);
-              _context2.prev = 6;
-              _iterator2.s();
-            case 8:
-              if ((_step2 = _iterator2.n()).done) {
-                _context2.next = 17;
+              scrollPositions = domState.scrollPositions || [];
+              activeIndex = (_domState$activeIndex = domState.activeIndex) !== null && _domState$activeIndex !== void 0 ? _domState$activeIndex : -1;
+              if (root === root.ownerDocument.body && activeIndex === 0) {
+                activeIndex = -1;
+              }
+              if (!(!scrollPositions.length && activeIndex < 0)) {
+                _context2.next = 9;
                 break;
               }
-              state = _step2.value;
-              element = elements[state.index];
-              if (element) {
-                _context2.next = 13;
+              return _context2.abrupt("return");
+            case 9:
+              // Wait only when restoring nonzero scroll positions.
+              //if (scrollPositions.length) {
+              //    await new Promise(requestAnimationFrame);
+              //}
+              lastScrollIndex = scrollPositions.length ? scrollPositions[scrollPositions.length - 1].index : -1;
+              lastIndex = Math.max(activeIndex, lastScrollIndex);
+              walker = root.ownerDocument.createTreeWalker(root, NodeFilter.SHOW_ELEMENT);
+              element = root;
+              scrollIndex = 0;
+              for (index = 0; element && index <= lastIndex; index++, element = walker.nextNode()) {
+                if (index === activeIndex) {
+                  activeElement = element;
+                }
+                if (scrollIndex < scrollPositions.length && scrollPositions[scrollIndex].index === index) {
+                  state = scrollPositions[scrollIndex++];
+                  left = element.scrollLeft;
+                  top = element.scrollTop;
+                  if (left !== state.scrollLeft) {
+                    element.scrollLeft = state.scrollLeft;
+                  }
+                  if (top !== state.scrollTop) {
+                    element.scrollTop = state.scrollTop;
+                  }
+                }
+              }
+              if (!(!activeElement || focus === "none")) {
+                _context2.next = 17;
                 break;
               }
-              return _context2.abrupt("continue", 15);
-            case 13:
-              element.scrollLeft = state.scrollLeft;
-              element.scrollTop = state.scrollTop;
-            case 15:
-              _context2.next = 8;
-              break;
+              return _context2.abrupt("return");
             case 17:
-              _context2.next = 22;
-              break;
-            case 19:
-              _context2.prev = 19;
-              _context2.t0 = _context2["catch"](6);
-              _iterator2.e(_context2.t0);
-            case 22:
-              _context2.prev = 22;
-              _iterator2.f();
-              return _context2.finish(22);
-            case 25:
-              activeElement = elements[domState.activeIndex];
-              if (activeElement) {
-                _context2.next = 28;
+              if (!(focus === "editable")) {
+                _context2.next = 22;
+                break;
+              }
+              tag = activeElement.localName;
+              editable = tag === "textarea" || tag === "select" || tag === "input" && activeElement.type !== "hidden" || activeElement.isContentEditable;
+              if (editable) {
+                _context2.next = 22;
                 break;
               }
               return _context2.abrupt("return");
-            case 28:
+            case 22:
               try {
                 activeElement.focus({
                   preventScroll: true
                 });
               } catch (_unused) {
-                (_activeElement$focus = activeElement.focus) === null || _activeElement$focus === void 0 || _activeElement$focus.call(activeElement);
+                (_activeElement$focus = (_activeElement = activeElement).focus) === null || _activeElement$focus === void 0 || _activeElement$focus.call(_activeElement);
               }
               if (domState.selection && typeof activeElement.setSelectionRange === "function") {
                 try {
                   activeElement.setSelectionRange(domState.selection.start, domState.selection.end, domState.selection.direction);
                 } catch (_unused2) {}
               }
-            case 30:
+            case 24:
             case "end":
               return _context2.stop();
           }
-        }, _callee2, null, [[6, 19, 22, 25]]);
+        }, _callee2);
       }));
       function restoreDomInteractionState(_x2, _x3) {
         return _restoreDomInteractionState.apply(this, arguments);
@@ -412,20 +499,20 @@ var TModelUtil = /*#__PURE__*/function () {
       tmodel.domWidthTimestamp = 0;
       tmodel.tfMap = {};
       tmodel.styleMap = {};
-      var _iterator3 = _createForOfIteratorHelper(tmodel.allStyleTargetMap),
-        _step3;
+      var _iterator2 = _createForOfIteratorHelper(tmodel.allStyleTargetMap),
+        _step2;
       try {
-        for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
-          var _step3$value = _slicedToArray(_step3.value, 1),
-            key = _step3$value[0];
+        for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
+          var _step2$value = _slicedToArray(_step2.value, 1),
+            key = _step2$value[0];
           if (TUtil.isDefined(tmodel.val(key))) {
             tmodel.addToStyleTargetList(key);
           }
         }
       } catch (err) {
-        _iterator3.e(err);
+        _iterator2.e(err);
       } finally {
-        _iterator3.f();
+        _iterator2.f();
       }
     }
   }, {
@@ -506,11 +593,11 @@ var TModelUtil = /*#__PURE__*/function () {
         return;
       }
       var transformChanged = false;
-      var _iterator4 = _createForOfIteratorHelper(originalKeys),
-        _step4;
+      var _iterator3 = _createForOfIteratorHelper(originalKeys),
+        _step3;
       try {
-        for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
-          var originalKey = _step4.value;
+        for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
+          var originalKey = _step3.value;
           var key = TargetUtil.getTargetName(originalKey);
           var value = tmodel.val(key);
           if (!TUtil.isDefined(value)) {
@@ -549,9 +636,9 @@ var TModelUtil = /*#__PURE__*/function () {
           tmodel.$dom.style(key, styleValue);
         }
       } catch (err) {
-        _iterator4.e(err);
+        _iterator3.e(err);
       } finally {
-        _iterator4.f();
+        _iterator3.f();
       }
       if (transformChanged) {
         var transformValues = _objectSpread(_objectSpread({}, TModelUtil.getTransformBaseFromActualValues(tmodel)), tmodel.tfMap);
@@ -638,12 +725,12 @@ var TModelUtil = /*#__PURE__*/function () {
       if (!tmodel.asyncStyleTargetMap) {
         return;
       }
-      var _iterator5 = _createForOfIteratorHelper(tmodel.asyncStyleTargetMap),
-        _step5;
+      var _iterator4 = _createForOfIteratorHelper(tmodel.asyncStyleTargetMap),
+        _step4;
       try {
-        var _loop2 = function _loop2() {
-          var _step5$value = _slicedToArray(_step5.value, 1),
-            key = _step5$value[0];
+        var _loop = function _loop() {
+          var _step4$value = _slicedToArray(_step4.value, 1),
+            key = _step4$value[0];
           if (key === 'style') {
             var style = tmodel.getStyle();
             if (TUtil.isDefined(style) && tmodel.styleMap.style !== style) {
@@ -678,13 +765,13 @@ var TModelUtil = /*#__PURE__*/function () {
             }
           }
         };
-        for (_iterator5.s(); !(_step5 = _iterator5.n()).done;) {
-          _loop2();
+        for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
+          _loop();
         }
       } catch (err) {
-        _iterator5.e(err);
+        _iterator4.e(err);
       } finally {
-        _iterator5.f();
+        _iterator4.f();
       }
       tmodel.asyncStyleTargetMap.clear();
     }
@@ -752,20 +839,20 @@ var TModelUtil = /*#__PURE__*/function () {
       };
       var firstIdx = function firstIdx(candidates) {
         var best = Infinity;
-        var _iterator6 = _createForOfIteratorHelper(candidates),
-          _step6;
+        var _iterator5 = _createForOfIteratorHelper(candidates),
+          _step5;
         try {
-          for (_iterator6.s(); !(_step6 = _iterator6.n()).done;) {
-            var c = _step6.value;
+          for (_iterator5.s(); !(_step5 = _iterator5.n()).done;) {
+            var c = _step5.value;
             var i = names.indexOf(c);
             if (i >= 0 && i < best) {
               best = i;
             }
           }
         } catch (err) {
-          _iterator6.e(err);
+          _iterator5.e(err);
         } finally {
-          _iterator6.f();
+          _iterator5.f();
         }
         return best;
       };

package/build/TUtil.js

@@ -312,7 +312,7 @@ var TUtil = /*#__PURE__*/function () {
   }, {
     key: "advanceTargetByElapsed",
     value: function advanceTargetByElapsed(tmodel, key) {
-      var _targetValue$valueLis3;
+      var _targetValue$valueLis2;
       var targetValue = tmodel.targetValues[key];
       if (!targetValue) {
         return {
@@ -323,19 +323,19 @@ var TUtil = /*#__PURE__*/function () {
         };
       }
       if (!TUtil.isDefined(targetValue.catchupAt)) {
-        var _targetValue$valueLis, _targetValue$valueLis2;
+        var _targetValue$valueLis;
         var step = tmodel.getTargetStep(key);
         var valuePointer = (_targetValue$valueLis = targetValue.valueList) !== null && _targetValue$valueLis !== void 0 && _targetValue$valueLis.length ? tmodel.getValueListPointer(key) : 0;
         return {
           step: step,
           cycle: tmodel.getTargetCycle(key),
           valuePointer: valuePointer,
-          done: (_targetValue$valueLis2 = targetValue.valueList) !== null && _targetValue$valueLis2 !== void 0 && _targetValue$valueLis2.length ? valuePointer >= targetValue.valueList.length : false
+          done: !TargetUtil.isTargetUpdating(tmodel, key)
         };
       }
       var now = TUtil.now();
       var elapsedMs = now - targetValue.catchupAt;
-      var progress = (_targetValue$valueLis3 = targetValue.valueList) !== null && _targetValue$valueLis3 !== void 0 && _targetValue$valueLis3.length ? TUtil.advanceValueListTargetByElapsed(tmodel, key, elapsedMs) : TUtil.advanceSimpleTargetByElapsed(tmodel, key, elapsedMs);
+      var progress = (_targetValue$valueLis2 = targetValue.valueList) !== null && _targetValue$valueLis2 !== void 0 && _targetValue$valueLis2.length ? TUtil.advanceValueListTargetByElapsed(tmodel, key, elapsedMs) : TUtil.advanceSimpleTargetByElapsed(tmodel, key, elapsedMs);
       if (!progress.done) {
         targetValue.catchupAt = now - progress.remainingMs;
       }