targetj 1.0.238 → 1.0.239

package/build/AnimationManager.js

@@ -10,6 +10,7 @@ var _TargetData = require("./TargetData.js");
 var _App = require("./App.js");
 var _TargetUtil = require("./TargetUtil.js");
 var _TUtil = require("./TUtil.js");
+var _ScheduleUtil = require("./ScheduleUtil.js");
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
 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); }
@@ -18,9 +19,6 @@ function _slicedToArray(r, e) { return _arrayWithHoles(r) || _iterableToArrayLim
 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 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 _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."); }
@@ -28,6 +26,9 @@ function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r)
 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 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 _classCallCheck(a, n) { if (!(a instanceof n)) throw new TypeError("Cannot call a class as a function"); }
 function _defineProperties(e, r) { for (var t = 0; t < r.length; t++) { var o = r[t]; o.enumerable = o.enumerable || !1, o.configurable = !0, "value" in o && (o.writable = !0), Object.defineProperty(e, _toPropertyKey(o.key), o); } }
 function _createClass(e, r, t) { return r && _defineProperties(e.prototype, r), t && _defineProperties(e, t), Object.defineProperty(e, "prototype", { writable: !1 }), e; }
@@ -46,22 +47,43 @@ var AnimationManager = exports.AnimationManager = /*#__PURE__*/function () {
   }
   return _createClass(AnimationManager, [{
     key: "animate",
-    value: function animate(tmodel, batch, hooks) {
-      if (this.isShuttingDown || !tmodel.hasDom()) {
+    value: function animate(tmodel) {
+      var batch = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : _AnimationUtil.AnimationUtil.emptyBatch();
+      var hooks = arguments.length > 2 ? arguments[2] : undefined;
+      var pausedKeys = arguments.length > 3 ? arguments[3] : undefined;
+      if (this.isShuttingDown) {
         return;
       }
-      var el = tmodel.$dom.getElement();
       batch.frames.sort(function (a, b) {
         return a.keyTime - b.keyTime;
       });
-      this.cancelElementAnimationsForKeys(el, Object.keys(batch.keyMap));
       if (tmodel.lastBatch) {
         var cutTime = Math.min(_TUtil.TUtil.now() - tmodel.lastBatch.startTime, tmodel.lastBatch.totalDuration);
-        this.cutLastBatch(tmodel, tmodel.lastBatch, cutTime);
-        this.callFireOnEndOnConflict(tmodel, tmodel.lastBatch, batch);
-        this.mergeBatches(tmodel.lastBatch, batch);
-        this.deleteAnimation(tmodel);
+        tmodel.lastBatch = this.cutLastBatch(tmodel, tmodel.lastBatch, cutTime);
+        _AnimationUtil.AnimationUtil.rebaseCutBatchMeta(tmodel, tmodel.lastBatch);
+        if (pausedKeys !== null && pausedKeys !== void 0 && pausedKeys.size) {
+          var pausedFrame = {
+            styleMap: _objectSpread({}, tmodel.lastBatch.frames[0].styleMap),
+            tfMap: _objectSpread({}, tmodel.lastBatch.frames[0].tfMap),
+            keyMeta: new Map(tmodel.lastBatch.frames[0].keyMeta)
+          };
+          _AnimationUtil.AnimationUtil.addToUpdatingTargets(tmodel, pausedKeys);
+          _AnimationUtil.AnimationUtil.removeKeysFromBatch(tmodel.lastBatch, pausedKeys);
+          this.callFireOnEndOnConflict(tmodel, tmodel.lastBatch, batch);
+          this.mergeBatches(tmodel.lastBatch, batch);
+          this.deleteAnimation(tmodel);
+          this.fixTModelStyleFromFrame(tmodel, pausedFrame);
+        } else {
+          this.callFireOnEndOnConflict(tmodel, tmodel.lastBatch, batch);
+          this.mergeBatches(tmodel.lastBatch, batch);
+          this.deleteAnimation(tmodel);
+        }
+      }
+      if (!tmodel.hasDom() || !batch.frames.length || !Object.keys(batch.keyMap).length) {
+        return;
       }
+      var el = tmodel.$dom.getElement();
+      this.cancelElementAnimationsForKeys(el, Object.keys(batch.keyMap));
       var totalDuration = Math.max(batch.totalDuration, 1);
       var originalKeys = _toConsumableArray(new Set(Object.values(batch.keyMap).flatMap(function (set) {
         return _toConsumableArray(set);
@@ -130,9 +152,10 @@ var AnimationManager = exports.AnimationManager = /*#__PURE__*/function () {
             needsFireOnStep: true,
             hooks: hooks
           };
-          tmodel.addToAnimatingMap(_originalKey, rec);
-          if (tmodel.targetValues[_originalKey]) {
-            tmodel.targetValues[_originalKey].status = 'updating';
+          tmodel.addToAnimatingMap(_originalKey);
+          var targetValue = tmodel.targetValues[_originalKey];
+          if (targetValue) {
+            targetValue.status = !targetValue.snapAnimation ? 'updating' : targetValue.status;
           }
           this.recordMap.set(recId, rec);
         }
@@ -143,6 +166,23 @@ var AnimationManager = exports.AnimationManager = /*#__PURE__*/function () {
       }
       this.startProgressPoller();
     }
+  }, {
+    key: "pauseAnimations",
+    value: function pauseAnimations(tmodel, keys) {
+      var keySet;
+      if (!keys) {
+        var _tmodel$animatingMap$, _tmodel$animatingMap;
+        keySet = new Set((_tmodel$animatingMap$ = (_tmodel$animatingMap = tmodel.animatingMap) === null || _tmodel$animatingMap === void 0 ? void 0 : _tmodel$animatingMap.keys()) !== null && _tmodel$animatingMap$ !== void 0 ? _tmodel$animatingMap$ : []);
+      } else if (keys instanceof Map) {
+        keySet = new Set(keys.keys());
+      } else {
+        keySet = new Set(keys);
+      }
+      if (!keySet.size) {
+        return;
+      }
+      this.animate(tmodel, _AnimationUtil.AnimationUtil.emptyBatch(), _AnimationUtil.AnimationUtil.getAnimationHooks(), keySet);
+    }
   }, {
     key: "finalizeAnimation",
     value: function finalizeAnimation(anim) {
@@ -164,24 +204,7 @@ var AnimationManager = exports.AnimationManager = /*#__PURE__*/function () {
             cleanKey = rec.cleanKey;
           tmodel.removeFromAnimatingMap(originalKey);
           this.recordMap.delete(recId);
-          if (tmodel.finalRawFrame) {
-            var frames = rec.frames;
-            var lastFrame = frames && frames[frames.length - 1];
-            var value = lastFrame ? lastFrame.value : this.getAt(tmodel.finalRawFrame, cleanKey);
-            this.setAt(tmodel, cleanKey, value);
-            tmodel.val(originalKey, value);
-            var targetValue = tmodel.targetValues[originalKey];
-            if (targetValue) {
-              var _targetValue$valueLis, _targetValue$valueLis2;
-              targetValue.step = tmodel.getTargetSteps(originalKey);
-              targetValue.valuePointer = (_targetValue$valueLis = (_targetValue$valueLis2 = targetValue.valueList) === null || _targetValue$valueLis2 === void 0 ? void 0 : _targetValue$valueLis2.length) !== null && _targetValue$valueLis !== void 0 ? _targetValue$valueLis : 0;
-              targetValue.value = value;
-              tmodel.setActual(originalKey, value);
-              if (tmodel.isTargetImperative(originalKey)) {
-                targetValue.cycle = targetValue.cycles;
-              }
-            }
-          }
+          this.completeRecord(tmodel, rec, cleanKey, originalKey);
           if (!tmodel.hasAnimatingTargets()) {
             if (tmodel.finalKeyframe) {
               if (tmodel.hasDom()) {
@@ -189,7 +212,6 @@ var AnimationManager = exports.AnimationManager = /*#__PURE__*/function () {
               }
             }
             tmodel.lastBatch = undefined;
-            tmodel.pausedBatch = undefined;
           }
           rec.status = 'complete';
           rec.hooks.fireOnEnd(tmodel, originalKey);
@@ -212,45 +234,78 @@ var AnimationManager = exports.AnimationManager = /*#__PURE__*/function () {
       this.waapiPoller.alive = true;
       var _tick = function tick() {
         var animsToFinalize = new Set();
+        var pauseMap = new Map();
         var hasPlaying = false;
         var _iterator4 = _createForOfIteratorHelper(_this.recordMap),
           _step4;
         try {
           for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
-            var _record$anim$effect, _record$anim$effect$g, _record$anim$effect2;
+            var _record$anim$effect, _record$anim$effect$g, _record$anim$effect2, _ct$progress;
             var _step4$value = _slicedToArray(_step4.value, 2),
               record = _step4$value[1];
-            if (record.status === 'canceled') {
+            if (record.status === 'canceled' || record.status === 'detached') {
               continue;
-            } else if (record.status === 'playing') {
+            }
+            var tmodel = record.tmodel,
+              originalKey = record.originalKey;
+            if (record.status !== 'finished' && _ScheduleUtil.ScheduleUtil.shouldPauseTarget(tmodel, originalKey)) {
+              var keys = pauseMap.get(tmodel);
+              if (!keys) {
+                keys = new Set();
+                pauseMap.set(tmodel, keys);
+              }
+              keys.add(originalKey);
+              continue;
+            }
+            if (record.status === 'playing') {
               hasPlaying = true;
             }
-            _this.updateTModelFromRecord(record);
             var ps = record.anim.playState;
             var ct = (_record$anim$effect = record.anim.effect) === null || _record$anim$effect === void 0 || (_record$anim$effect$g = (_record$anim$effect2 = _record$anim$effect).getComputedTiming) === null || _record$anim$effect$g === void 0 ? void 0 : _record$anim$effect$g.call(_record$anim$effect2);
-            var finished = ps === "finished" || ps === "idle" || ct && ct.progress >= 0.999999;
+            var progress = (_ct$progress = ct === null || ct === void 0 ? void 0 : ct.progress) !== null && _ct$progress !== void 0 ? _ct$progress : 0;
+            var finished = ps === "finished" || ps === "idle" || progress >= 0.999999;
             if (finished) {
               record.status = 'done';
               animsToFinalize.add(record.anim);
             }
+            if (progress > 0 && record.status !== 'finished') {
+              var result = _AnimationUtil.AnimationUtil.updateTModelFromRecord(record);
+              if ((result === null || result === void 0 ? void 0 : result.status) === 'finished') {
+                record.status = 'finished';
+              }
+            }
           }
         } catch (err) {
           _iterator4.e(err);
         } finally {
           _iterator4.f();
         }
-        var _iterator5 = _createForOfIteratorHelper(animsToFinalize),
+        var _iterator5 = _createForOfIteratorHelper(pauseMap),
           _step5;
         try {
           for (_iterator5.s(); !(_step5 = _iterator5.n()).done;) {
-            var anim = _step5.value;
-            _this.finalizeAnimation(anim);
+            var _step5$value = _slicedToArray(_step5.value, 2),
+              _tmodel = _step5$value[0],
+              _keys = _step5$value[1];
+            _this.pauseAnimations(_tmodel, _keys);
           }
         } catch (err) {
           _iterator5.e(err);
         } finally {
           _iterator5.f();
         }
+        var _iterator6 = _createForOfIteratorHelper(animsToFinalize),
+          _step6;
+        try {
+          for (_iterator6.s(); !(_step6 = _iterator6.n()).done;) {
+            var anim = _step6.value;
+            _this.finalizeAnimation(anim);
+          }
+        } catch (err) {
+          _iterator6.e(err);
+        } finally {
+          _iterator6.f();
+        }
         if (_this.recordMap.size > 0 || hasPlaying) {
           _this.waapiPoller.rafId = requestAnimationFrame(_tick);
         } else {
@@ -274,13 +329,32 @@ var AnimationManager = exports.AnimationManager = /*#__PURE__*/function () {
         frame.styleMap[key] = value;
       }
     }
+  }, {
+    key: "completeRecord",
+    value: function completeRecord(tmodel, record, cleanKey, originalKey) {
+      if (tmodel.finalRawFrame) {
+        var frames = record.frames;
+        var lastFrame = frames && frames[frames.length - 1];
+        var value = lastFrame ? lastFrame.value : this.getAt(tmodel.finalRawFrame, cleanKey);
+        this.setAt(tmodel, cleanKey, value);
+        tmodel.val(originalKey, value);
+        var targetValue = tmodel.targetValues[originalKey];
+        if (targetValue) {
+          var _targetValue$valueLis, _targetValue$valueLis2;
+          targetValue.step = tmodel.getTargetSteps(originalKey);
+          targetValue.valuePointer = (_targetValue$valueLis = (_targetValue$valueLis2 = targetValue.valueList) === null || _targetValue$valueLis2 === void 0 ? void 0 : _targetValue$valueLis2.length) !== null && _targetValue$valueLis !== void 0 ? _targetValue$valueLis : 0;
+          targetValue.value = value;
+          tmodel.setActual(originalKey, value);
+          if (tmodel.isTargetImperative(originalKey)) {
+            targetValue.cycle = targetValue.cycles;
+          }
+        }
+      }
+    }
   }, {
     key: "backfillKeyAcrossFramesUsingMorph",
     value: function backfillKeyAcrossFramesUsingMorph(tmodel, originalKey, frames) {
       var cleanKey = _TargetUtil.TargetUtil.getTargetName(originalKey);
-      var times = frames.map(function (f) {
-        return f.keyTime;
-      });
       var idxs = [];
       for (var i = 0; i < frames.length; i++) {
         if (this.getAt(frames[i], cleanKey) !== undefined) {
@@ -289,78 +363,106 @@ var AnimationManager = exports.AnimationManager = /*#__PURE__*/function () {
       }
       if (idxs.length >= 2) {
         for (var m = 0; m < idxs.length - 1; m++) {
+          var _rightFrame$keyMeta, _rightMeta$segmentSte;
           var i0 = idxs[m];
           var i1 = idxs[m + 1];
-          var from = this.getAt(frames[i0], cleanKey);
-          var to = this.getAt(frames[i1], cleanKey);
-          var meta = frames[i1].keyMeta.get(cleanKey);
-          if (!meta) {
+          var leftFrame = frames[i0];
+          var rightFrame = frames[i1];
+          var from = this.getAt(leftFrame, cleanKey);
+          var to = this.getAt(rightFrame, cleanKey);
+          var rightMeta = (_rightFrame$keyMeta = rightFrame.keyMeta) === null || _rightFrame$keyMeta === void 0 ? void 0 : _rightFrame$keyMeta.get(cleanKey);
+          if (!rightMeta) {
+            continue;
+          }
+          var spanSteps = rightMeta.steps;
+          var baseStepOffset = rightMeta.stepOffset || 0;
+          var segmentSteps = (_rightMeta$segmentSte = rightMeta.segmentSteps) !== null && _rightMeta$segmentSte !== void 0 ? _rightMeta$segmentSte : spanSteps;
+          var t0 = leftFrame.keyTime;
+          var t1 = rightFrame.keyTime;
+          var spanTime = t1 - t0;
+          if (!_TUtil.TUtil.isDefined(spanSteps) || spanSteps <= 0 || spanTime <= 0) {
             continue;
           }
-          var steps = meta.steps;
-          var interval = meta.interval;
-          var duration = steps * interval;
-          var t0 = times[i0];
-          var t1 = times[i1];
-          var u = (t1 - t0) / duration;
+          var previousLogicalStep = baseStepOffset;
           for (var _i = i0 + 1; _i < i1; _i++) {
-            var t = times[_i];
-            var elapsed = t - t0;
-            var step = _TUtil.TUtil.limit(Math.round(elapsed / (u * interval)), 0, steps);
-            var v = _TModelUtil.TModelUtil.easingMorph(tmodel, originalKey, from, to, step, steps);
-            this.setAt(frames[_i], cleanKey, v);
-            frames[_i].keyMeta.set(cleanKey, {
-              steps: step,
-              interval: interval
-            });
+            var frame = frames[_i];
+            var progress = _TUtil.TUtil.limit((frame.keyTime - t0) / spanTime, 0, 1);
+            var localStep = Math.round(progress * spanSteps);
+            var logicalStep = _TUtil.TUtil.limit(baseStepOffset + localStep, 0, segmentSteps);
+            var stepsFromPreviousFrame = Math.max(logicalStep - previousLogicalStep, 0);
+            var v = _TModelUtil.TModelUtil.morph(originalKey, from, to, progress);
+            this.setAt(frame, cleanKey, v);
+            frame.keyMeta.set(cleanKey, _objectSpread(_objectSpread({}, rightMeta), {}, {
+              steps: stepsFromPreviousFrame,
+              stepOffset: previousLogicalStep,
+              segmentSteps: segmentSteps,
+              done: false
+            }));
+            previousLogicalStep = logicalStep;
           }
         }
       }
       if (idxs.length) {
+        var _lastFrame$keyMeta, _ref, _lastMeta$segmentStep;
         var lastIndex = idxs[idxs.length - 1];
         var lastFrame = frames[lastIndex];
         var lastValue = this.getAt(lastFrame, cleanKey);
+        var lastMeta = (_lastFrame$keyMeta = lastFrame.keyMeta) === null || _lastFrame$keyMeta === void 0 ? void 0 : _lastFrame$keyMeta.get(cleanKey);
+        if (!lastMeta) {
+          return;
+        }
+        var _segmentSteps = (_ref = (_lastMeta$segmentStep = lastMeta.segmentSteps) !== null && _lastMeta$segmentStep !== void 0 ? _lastMeta$segmentStep : lastMeta.steps) !== null && _ref !== void 0 ? _ref : 0;
         for (var _i2 = lastIndex + 1; _i2 < frames.length; _i2++) {
-          this.setAt(frames[_i2], cleanKey, lastValue);
-          frames[_i2].keyMeta.set(cleanKey, {
-            steps: 0
-          });
+          var _frame = frames[_i2];
+          this.setAt(_frame, cleanKey, lastValue);
+          _frame.keyMeta.set(cleanKey, _objectSpread(_objectSpread({}, lastMeta), {}, {
+            steps: 0,
+            stepOffset: _segmentSteps,
+            segmentSteps: _segmentSteps,
+            done: true
+          }));
         }
       }
     }
   }, {
-    key: "freezeTModelAtCurrentTime",
-    value: function freezeTModelAtCurrentTime(tmodel) {
-      var batch = tmodel.lastBatch;
-      var cutTime = Math.min(_TUtil.TUtil.now() - batch.startTime, batch.totalDuration);
-      this.cutLastBatch(tmodel, batch, cutTime);
-      var frame0 = batch.frames[0];
-      if (!frame0) {
+    key: "fixTModelStyleFromFrame",
+    value: function fixTModelStyleFromFrame(tmodel, frame) {
+      if (!tmodel.hasDom() || !frame) {
         return;
       }
-      var out = _objectSpread({}, frame0.styleMap);
-      var hasTf = Object.keys(frame0.tfMap).length > 0;
+      var out = _objectSpread({}, frame.styleMap);
+      var hasTf = Object.keys(frame.tfMap).length > 0;
       if (hasTf) {
         Object.keys(tmodel.tfMap).forEach(function (key) {
           tmodel.tfMap[key] = tmodel.val(key);
         });
-        var tfMap = _objectSpread(_objectSpread({}, tmodel.tfMap), frame0.tfMap);
-        frame0.tfMap = tfMap;
+        var tfMap = _objectSpread(_objectSpread({}, tmodel.tfMap), frame.tfMap);
+        frame.tfMap = tfMap;
         out.transform = _TModelUtil.TModelUtil.getTransformString(tmodel, tfMap);
       }
       _AnimationUtil.AnimationUtil.addUnitsToFrame(out);
       _AnimationUtil.AnimationUtil.fixStyleByAnimation(tmodel, out);
     }
+  }, {
+    key: "freezeTModelAtCurrentTime",
+    value: function freezeTModelAtCurrentTime(tmodel) {
+      if (!tmodel.lastBatch) {
+        return;
+      }
+      var cutTime = Math.min(_TUtil.TUtil.now() - tmodel.lastBatch.startTime, tmodel.lastBatch.totalDuration);
+      tmodel.lastBatch = this.cutLastBatch(tmodel, tmodel.lastBatch, cutTime);
+      this.fixTModelStyleFromFrame(tmodel, tmodel.lastBatch.frames[0]);
+    }
   }, {
     key: "collectFramesForKey",
     value: function collectFramesForKey(batch, cleanKey) {
       var out = [];
       var total = batch.totalDuration;
-      var _iterator6 = _createForOfIteratorHelper(batch.frames),
-        _step6;
+      var _iterator7 = _createForOfIteratorHelper(batch.frames),
+        _step7;
       try {
-        for (_iterator6.s(); !(_step6 = _iterator6.n()).done;) {
-          var frame = _step6.value;
+        for (_iterator7.s(); !(_step7 = _iterator7.n()).done;) {
+          var frame = _step7.value;
           var value = this.getAt(frame, cleanKey);
           if (value === undefined) {
             continue;
@@ -369,15 +471,20 @@ var AnimationManager = exports.AnimationManager = /*#__PURE__*/function () {
           out.push({
             value: value,
             time: frame.keyTime,
+            offset: frame.keyTime / total,
             steps: meta === null || meta === void 0 ? void 0 : meta.steps,
+            segmentSteps: meta === null || meta === void 0 ? void 0 : meta.segmentSteps,
             interval: meta === null || meta === void 0 ? void 0 : meta.interval,
-            offset: frame.keyTime / total
+            stepOffset: (meta === null || meta === void 0 ? void 0 : meta.stepOffset) || 0,
+            valuePointer: meta === null || meta === void 0 ? void 0 : meta.valuePointer,
+            cycle: meta === null || meta === void 0 ? void 0 : meta.cycle,
+            done: !!(meta !== null && meta !== void 0 && meta.done)
           });
         }
       } catch (err) {
-        _iterator6.e(err);
+        _iterator7.e(err);
       } finally {
-        _iterator6.f();
+        _iterator7.f();
       }
       out.sort(function (a, b) {
         return a.time - b.time;
@@ -389,31 +496,6 @@ var AnimationManager = exports.AnimationManager = /*#__PURE__*/function () {
     value: function getRecordId(tmodel, key) {
       return "".concat(tmodel.oid, "-").concat(key);
     }
-  }, {
-    key: "updateTModelFromRecord",
-    value: function updateTModelFromRecord(record) {
-      var tmodel = record.tmodel,
-        originalKey = record.originalKey,
-        cleanKey = record.cleanKey;
-      var result = this.getValueFromAnim(record);
-      if (!result) {
-        return;
-      }
-      var value = result.value,
-        step = result.step;
-      this.setAt(tmodel, cleanKey, value);
-      tmodel.val(originalKey, value);
-      if (tmodel.targetValues[originalKey]) {
-        tmodel.targetValues[originalKey].step = step;
-        tmodel.setActual(originalKey, value);
-        if (record.needsFireOnStep) {
-          var needsRefire = record.hooks.fireOnStep(tmodel, originalKey, step);
-          if (!needsRefire) {
-            record.needsFireOnStep = false;
-          }
-        }
-      }
-    }
   }, {
     key: "delete",
     value: function _delete(record) {
@@ -428,22 +510,22 @@ var AnimationManager = exports.AnimationManager = /*#__PURE__*/function () {
   }, {
     key: "deleteAnimation",
     value: function deleteAnimation(tmodel) {
-      var _iterator7 = _createForOfIteratorHelper(this.recordMap),
-        _step7;
+      var _iterator8 = _createForOfIteratorHelper(this.recordMap),
+        _step8;
       try {
-        for (_iterator7.s(); !(_step7 = _iterator7.n()).done;) {
-          var _step7$value = _slicedToArray(_step7.value, 2),
-            recId = _step7$value[0],
-            record = _step7$value[1];
+        for (_iterator8.s(); !(_step8 = _iterator8.n()).done;) {
+          var _step8$value = _slicedToArray(_step8.value, 2),
+            recId = _step8$value[0],
+            record = _step8$value[1];
           if (recId.startsWith("".concat(tmodel.oid, "-"))) {
             ;
             this.delete(record);
           }
         }
       } catch (err) {
-        _iterator7.e(err);
+        _iterator8.e(err);
       } finally {
-        _iterator7.f();
+        _iterator8.f();
       }
       tmodel.lastBatch = undefined;
       tmodel.finalKeyframe = undefined;
@@ -463,7 +545,7 @@ var AnimationManager = exports.AnimationManager = /*#__PURE__*/function () {
     key: "deleteAll",
     value: function () {
       var _deleteAll = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-        var seen, _iterator8, _step8, _step8$value, record, tmodel;
+        var tmodels, _iterator9, _step9, _step9$value, record, _iterator10, _step10, tmodel;
         return _regeneratorRuntime().wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
@@ -473,53 +555,39 @@ var AnimationManager = exports.AnimationManager = /*#__PURE__*/function () {
                 this.waapiPoller.rafId = 0;
                 this.waapiPoller.alive = false;
               }
-              seen = new Set();
-              _iterator8 = _createForOfIteratorHelper(this.recordMap);
-              _context.prev = 4;
-              _iterator8.s();
-            case 6:
-              if ((_step8 = _iterator8.n()).done) {
-                _context.next = 22;
-                break;
+              tmodels = new Set();
+              _iterator9 = _createForOfIteratorHelper(this.recordMap);
+              try {
+                for (_iterator9.s(); !(_step9 = _iterator9.n()).done;) {
+                  _step9$value = _slicedToArray(_step9.value, 2), record = _step9$value[1];
+                  tmodels.add(record.tmodel);
+                }
+              } catch (err) {
+                _iterator9.e(err);
+              } finally {
+                _iterator9.f();
               }
-              _step8$value = _slicedToArray(_step8.value, 2), record = _step8$value[1];
-              tmodel = record.tmodel;
-              this.updateTModelFromRecord(record);
-              this.delete(record);
-              if (!seen.has(tmodel.oid)) {
-                _context.next = 13;
-                break;
+              _iterator10 = _createForOfIteratorHelper(tmodels);
+              try {
+                for (_iterator10.s(); !(_step10 = _iterator10.n()).done;) {
+                  tmodel = _step10.value;
+                  this.freezeTModelAtCurrentTime(tmodel);
+                  _AnimationUtil.AnimationUtil.detachAnimationsOnDeleteDom(tmodel);
+                  tmodel.lastBatch = undefined;
+                  tmodel.finalKeyframe = undefined;
+                  tmodel.finalRawFrame = undefined;
+                }
+              } catch (err) {
+                _iterator10.e(err);
+              } finally {
+                _iterator10.f();
               }
-              return _context.abrupt("continue", 20);
-            case 13:
-              seen.add(tmodel.oid);
-              this.freezeTModelAtCurrentTime(tmodel);
-              tmodel.pausedBatch = tmodel.lastBatch;
-              tmodel.lastBatch = undefined;
-              tmodel.finalKeyframe = undefined;
-              tmodel.finalRawFrame = undefined;
-              tmodel.clearAnimatingMap();
-            case 20:
-              _context.next = 6;
-              break;
-            case 22:
-              _context.next = 27;
-              break;
-            case 24:
-              _context.prev = 24;
-              _context.t0 = _context["catch"](4);
-              _iterator8.e(_context.t0);
-            case 27:
-              _context.prev = 27;
-              _iterator8.f();
-              return _context.finish(27);
-            case 30:
               this.recordMap.clear();
-            case 31:
+            case 8:
             case "end":
               return _context.stop();
           }
-        }, _callee, this, [[4, 24, 27, 30]]);
+        }, _callee, this);
       }));
       function deleteAll() {
         return _deleteAll.apply(this, arguments);
@@ -549,52 +617,43 @@ var AnimationManager = exports.AnimationManager = /*#__PURE__*/function () {
       return flushOneFrame;
     }()
   }, {
-    key: "getValueFromAnim",
-    value: function getValueFromAnim(record) {
-      var _anim$effect, _anim$effect$getCompu;
-      var originalKey = record.originalKey,
-        anim = record.anim,
-        frames = record.frames;
-      if (!frames) {
-        return;
-      }
-      var ct = (_anim$effect = anim.effect) === null || _anim$effect === void 0 || (_anim$effect$getCompu = _anim$effect.getComputedTiming) === null || _anim$effect$getCompu === void 0 ? void 0 : _anim$effect$getCompu.call(_anim$effect);
-      if (!ct) {
-        return;
-      }
-      var p = _TUtil.TUtil.isDefined(ct.progress) ? _TUtil.TUtil.limit(ct.progress, 0, 1) : 1;
-      var last = frames.length - 1;
-      var k = 0;
-      if (p <= frames[0].offset) {
-        k = 0;
-      } else if (p >= frames[last].offset) {
-        k = last - 1;
-      } else {
-        for (var i = 0; i < last; i++) {
-          if (p >= frames[i].offset && p < frames[i + 1].offset) {
-            k = i;
-            break;
+    key: "fillCutFrameFromRecords",
+    value: function fillCutFrameFromRecords(tmodel, cutFrame) {
+      var _iterator11 = _createForOfIteratorHelper(this.recordMap),
+        _step11;
+      try {
+        for (_iterator11.s(); !(_step11 = _iterator11.n()).done;) {
+          var _ref2, _ref3, _result$remainingStep, _ref4, _result$steps, _targetValue$interval, _result$step;
+          var _step11$value = _slicedToArray(_step11.value, 2),
+            record = _step11$value[1];
+          if (record.tmodel !== tmodel) {
+            continue;
+          }
+          if (record.status === 'canceled' || record.status === 'detached') {
+            continue;
           }
+          var result = _AnimationUtil.AnimationUtil.getValueFromAnim(record);
+          if (!result) {
+            continue;
+          }
+          var cleanKey = record.cleanKey,
+            originalKey = record.originalKey;
+          var targetValue = tmodel.targetValues[originalKey];
+          this.setAt(cutFrame, cleanKey, result.value);
+          cutFrame.keyMeta.set(cleanKey, {
+            steps: (_ref2 = (_ref3 = (_result$remainingStep = result.remainingSteps) !== null && _result$remainingStep !== void 0 ? _result$remainingStep : result.steps) !== null && _ref3 !== void 0 ? _ref3 : targetValue === null || targetValue === void 0 ? void 0 : targetValue.steps) !== null && _ref2 !== void 0 ? _ref2 : 0,
+            segmentSteps: (_ref4 = (_result$steps = result.steps) !== null && _result$steps !== void 0 ? _result$steps : targetValue === null || targetValue === void 0 ? void 0 : targetValue.steps) !== null && _ref4 !== void 0 ? _ref4 : 0,
+            interval: (_targetValue$interval = targetValue === null || targetValue === void 0 ? void 0 : targetValue.interval) !== null && _targetValue$interval !== void 0 ? _targetValue$interval : 8,
+            stepOffset: (_result$step = result.step) !== null && _result$step !== void 0 ? _result$step : 0,
+            valuePointer: result.valuePointer,
+            cycle: result.cycle,
+            done: result.status === 'finished'
+          });
         }
-      }
-      var left = frames[k];
-      var right = frames[k + 1];
-      var from = left.value;
-      var to = right.value;
-      var segStart = left.offset;
-      var segEnd = right.offset;
-      var segSpan = segEnd - segStart;
-      if (segSpan > 0) {
-        var u = _TUtil.TUtil.limit((p - segStart) / segSpan, 0, 1);
-        var steps = right.steps;
-        var step = Math.round(u * steps);
-        step = _TUtil.TUtil.limit(step, 0, steps);
-        var value = _TModelUtil.TModelUtil.morph(originalKey, from, to, u);
-        return {
-          value: value,
-          step: step,
-          steps: steps
-        };
+      } catch (err) {
+        _iterator11.e(err);
+      } finally {
+        _iterator11.f();
       }
     }
   }, {
@@ -606,26 +665,28 @@ var AnimationManager = exports.AnimationManager = /*#__PURE__*/function () {
       }
       var needsInsert = i < batch.frames.length && cutTime !== batch.frames[i].keyTime;
       if (needsInsert) {
-        batch.frames.splice(i, 0, {
+        var cutFrame = {
           keyTime: cutTime,
           tfMap: {},
           styleMap: {},
           keyMeta: new Map()
-        });
+        };
+        batch.frames.splice(i, 0, cutFrame);
+        this.fillCutFrameFromRecords(tmodel, cutFrame);
         var originalKeys = _toConsumableArray(new Set(Object.values(batch.keyMap).flatMap(function (set) {
           return _toConsumableArray(set);
         })));
-        var _iterator9 = _createForOfIteratorHelper(originalKeys),
-          _step9;
+        var _iterator12 = _createForOfIteratorHelper(originalKeys),
+          _step12;
         try {
-          for (_iterator9.s(); !(_step9 = _iterator9.n()).done;) {
-            var originalKey = _step9.value;
+          for (_iterator12.s(); !(_step12 = _iterator12.n()).done;) {
+            var originalKey = _step12.value;
             this.backfillKeyAcrossFramesUsingMorph(tmodel, originalKey, batch.frames);
           }
         } catch (err) {
-          _iterator9.e(err);
+          _iterator12.e(err);
         } finally {
-          _iterator9.f();
+          _iterator12.f();
         }
         batch.frames = batch.frames.slice(i);
       }
@@ -633,6 +694,7 @@ var AnimationManager = exports.AnimationManager = /*#__PURE__*/function () {
         frame.keyTime = Math.max(0, frame.keyTime - cutTime);
       });
       batch.totalDuration = batch.frames.length ? batch.frames[batch.frames.length - 1].keyTime : 0;
+      return batch;
     }
   }, {
     key: "callFireOnEndOnConflict",
@@ -648,18 +710,18 @@ var AnimationManager = exports.AnimationManager = /*#__PURE__*/function () {
         }
 
         // Any old originalKey that’s not present anymore should be completed/canceled.
-        var _iterator10 = _createForOfIteratorHelper(oldSet),
-          _step10;
+        var _iterator13 = _createForOfIteratorHelper(oldSet),
+          _step13;
         try {
-          for (_iterator10.s(); !(_step10 = _iterator10.n()).done;) {
-            var oldOriginal = _step10.value;
+          for (_iterator13.s(); !(_step13 = _iterator13.n()).done;) {
+            var oldOriginal = _step13.value;
             if (newSet.has(oldOriginal)) {
               continue;
             }
             var recId = this.getRecordId(tmodel, oldOriginal);
             var oldRec = this.recordMap.get(recId);
-            if (oldRec && oldRec.status === 'playing') {
-              this.updateTModelFromRecord(oldRec);
+            if (oldRec) {
+              this.completeRecord(tmodel, oldRec, cleanKey, oldOriginal);
               oldRec.status = 'complete';
               oldRec.hooks.fireOnEnd(oldRec.tmodel, oldOriginal);
               oldRec.tmodel.removeFromAnimatingMap(oldOriginal);
@@ -667,117 +729,97 @@ var AnimationManager = exports.AnimationManager = /*#__PURE__*/function () {
             }
           }
         } catch (err) {
-          _iterator10.e(err);
+          _iterator13.e(err);
         } finally {
-          _iterator10.f();
+          _iterator13.f();
         }
       }
     }
   }, {
     key: "mergeBatches",
     value: function mergeBatches(lastBatch, newBatch) {
-      var newCleanKeys = Object.keys(newBatch.keyMap);
+      var newCleanKeys = new Set(Object.keys(newBatch.keyMap));
       var oldFrames = [];
-      var _iterator11 = _createForOfIteratorHelper(lastBatch.frames),
-        _step11;
+      var _iterator14 = _createForOfIteratorHelper(lastBatch.frames),
+        _step14;
       try {
-        for (_iterator11.s(); !(_step11 = _iterator11.n()).done;) {
-          var frame = _step11.value;
-          var _iterator13 = _createForOfIteratorHelper(newCleanKeys),
-            _step13;
+        for (_iterator14.s(); !(_step14 = _iterator14.n()).done;) {
+          var frame = _step14.value;
+          var _iterator16 = _createForOfIteratorHelper(newCleanKeys),
+            _step16;
           try {
-            for (_iterator13.s(); !(_step13 = _iterator13.n()).done;) {
-              var key = _step13.value;
-              delete frame.styleMap[key];
-              delete frame.tfMap[key];
-              delete lastBatch.keyMap[key];
+            for (_iterator16.s(); !(_step16 = _iterator16.n()).done;) {
+              var _frame$keyMeta;
+              var _key = _step16.value;
+              delete frame.styleMap[_key];
+              delete frame.tfMap[_key];
+              (_frame$keyMeta = frame.keyMeta) === null || _frame$keyMeta === void 0 || _frame$keyMeta.delete(_key);
             }
           } catch (err) {
-            _iterator13.e(err);
+            _iterator16.e(err);
           } finally {
-            _iterator13.f();
+            _iterator16.f();
           }
           if (Object.keys(frame.styleMap).length || Object.keys(frame.tfMap).length) {
             oldFrames.push(frame);
           }
         }
       } catch (err) {
-        _iterator11.e(err);
+        _iterator14.e(err);
       } finally {
-        _iterator11.f();
+        _iterator14.f();
+      }
+      var oldKeyMap = {};
+      for (var _i4 = 0, _Object$entries = Object.entries(lastBatch.keyMap); _i4 < _Object$entries.length; _i4++) {
+        var _Object$entries$_i = _slicedToArray(_Object$entries[_i4], 2),
+          key = _Object$entries$_i[0],
+          set = _Object$entries$_i[1];
+        if (!newCleanKeys.has(key)) {
+          oldKeyMap[key] = set;
+        }
       }
       newBatch.frames = [].concat(oldFrames, _toConsumableArray(newBatch.frames));
       newBatch.frames.sort(function (a, b) {
         return a.keyTime - b.keyTime;
       });
-
-      // Merge frames with identical keyTime
       var merged = [];
-      var _iterator12 = _createForOfIteratorHelper(newBatch.frames),
-        _step12;
+      var _iterator15 = _createForOfIteratorHelper(newBatch.frames),
+        _step15;
       try {
-        for (_iterator12.s(); !(_step12 = _iterator12.n()).done;) {
-          var f = _step12.value;
+        for (_iterator15.s(); !(_step15 = _iterator15.n()).done;) {
+          var f = _step15.value;
           var last = merged[merged.length - 1];
-          if (last && last.keyTime === f.keyTime) {
+          if (last && Math.abs(last.keyTime - f.keyTime) < 0.0001) {
             Object.assign(last.styleMap, f.styleMap);
             Object.assign(last.tfMap, f.tfMap);
             if (f.keyMeta) {
-              var _iterator14 = _createForOfIteratorHelper(f.keyMeta),
-                _step14;
+              var _iterator17 = _createForOfIteratorHelper(f.keyMeta),
+                _step17;
               try {
-                for (_iterator14.s(); !(_step14 = _iterator14.n()).done;) {
-                  var _step14$value = _slicedToArray(_step14.value, 2),
-                    k = _step14$value[0],
-                    v = _step14$value[1];
+                for (_iterator17.s(); !(_step17 = _iterator17.n()).done;) {
+                  var _step17$value = _slicedToArray(_step17.value, 2),
+                    k = _step17$value[0],
+                    v = _step17$value[1];
                   last.keyMeta.set(k, v);
                 }
               } catch (err) {
-                _iterator14.e(err);
+                _iterator17.e(err);
               } finally {
-                _iterator14.f();
+                _iterator17.f();
               }
             }
           } else {
             merged.push(f);
           }
         }
-      } catch (err) {
-        _iterator12.e(err);
-      } finally {
-        _iterator12.f();
-      }
-      newBatch.keyMap = _objectSpread(_objectSpread({}, newBatch.keyMap), lastBatch.keyMap);
-      newBatch.frames = merged;
-      newBatch.totalDuration = newBatch.frames.length ? newBatch.frames[newBatch.frames.length - 1].keyTime : 0;
-    }
-  }, {
-    key: "pauseTModel",
-    value: function pauseTModel(tmodel) {
-      var batch = tmodel.lastBatch;
-      if (!batch) {
-        return;
-      }
-      var _iterator15 = _createForOfIteratorHelper(tmodel.animatingMap),
-        _step15;
-      try {
-        for (_iterator15.s(); !(_step15 = _iterator15.n()).done;) {
-          var _step15$value = _slicedToArray(_step15.value, 1),
-            key = _step15$value[0];
-          if (tmodel.targetValues[key]) {
-            tmodel.targetValues[key].status = 'pause';
-          }
-        }
       } catch (err) {
         _iterator15.e(err);
       } finally {
         _iterator15.f();
       }
-      var cutTime = Math.min(_TUtil.TUtil.now() - batch.startTime, batch.totalDuration);
-      this.cutLastBatch(tmodel, batch, cutTime);
-      tmodel.pausedBatch = batch;
-      tmodel.lastBatch = undefined;
-      this.deleteAnimation(tmodel);
+      newBatch.keyMap = _objectSpread(_objectSpread({}, oldKeyMap), newBatch.keyMap);
+      newBatch.frames = merged;
+      newBatch.totalDuration = newBatch.frames.length ? newBatch.frames[newBatch.frames.length - 1].keyTime : 0;
     }
   }, {
     key: "areFramesEqual",
@@ -787,8 +829,8 @@ var AnimationManager = exports.AnimationManager = /*#__PURE__*/function () {
       if (keysA.length !== keysB.length) {
         return false;
       }
-      for (var _i4 = 0, _keysA = keysA; _i4 < _keysA.length; _i4++) {
-        var k = _keysA[_i4];
+      for (var _i5 = 0, _keysA = keysA; _i5 < _keysA.length; _i5++) {
+        var k = _keysA[_i5];
         if (k === 'offset') {
           continue;
         }
@@ -822,24 +864,24 @@ var AnimationManager = exports.AnimationManager = /*#__PURE__*/function () {
         return;
       }
       var keySet = new Set(cleanKeys);
-      var _iterator16 = _createForOfIteratorHelper(el.getAnimations()),
-        _step16;
+      var _iterator18 = _createForOfIteratorHelper(el.getAnimations()),
+        _step18;
       try {
-        for (_iterator16.s(); !(_step16 = _iterator16.n()).done;) {
-          var anim = _step16.value;
+        for (_iterator18.s(); !(_step18 = _iterator18.n()).done;) {
+          var anim = _step18.value;
           var effect = anim.effect;
           if (!(effect !== null && effect !== void 0 && effect.getKeyframes)) {
             continue;
           }
           var kfs = effect.getKeyframes();
           var touches = false;
-          var _iterator17 = _createForOfIteratorHelper(kfs),
-            _step17;
+          var _iterator19 = _createForOfIteratorHelper(kfs),
+            _step19;
           try {
-            for (_iterator17.s(); !(_step17 = _iterator17.n()).done;) {
-              var kf = _step17.value;
-              for (var _i5 = 0, _Object$keys2 = Object.keys(kf); _i5 < _Object$keys2.length; _i5++) {
-                var k = _Object$keys2[_i5];
+            for (_iterator19.s(); !(_step19 = _iterator19.n()).done;) {
+              var kf = _step19.value;
+              for (var _i6 = 0, _Object$keys2 = Object.keys(kf); _i6 < _Object$keys2.length; _i6++) {
+                var k = _Object$keys2[_i6];
                 if (keySet.has(k)) {
                   touches = true;
                   break;
@@ -850,9 +892,9 @@ var AnimationManager = exports.AnimationManager = /*#__PURE__*/function () {
               }
             }
           } catch (err) {
-            _iterator17.e(err);
+            _iterator19.e(err);
           } finally {
-            _iterator17.f();
+            _iterator19.f();
           }
           if (touches) {
             try {
@@ -861,9 +903,9 @@ var AnimationManager = exports.AnimationManager = /*#__PURE__*/function () {
           }
         }
       } catch (err) {
-        _iterator16.e(err);
+        _iterator18.e(err);
       } finally {
-        _iterator16.f();
+        _iterator18.f();
       }
     }
   }]);