targetj 1.0.260 → 1.1.0

package/build/ParticleTModel.js

@@ -1,11 +1,11 @@
+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."); }
 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 _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 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 _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 _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; } }
@@ -36,10 +36,11 @@ import { TModelFactory } from "./TModelFactory.js";
 import { ParticleRenderer } from "./ParticleRenderer.js";
 import { ParticleRuntime } from "./ParticleRuntime.js";
 import { ParticleUtil } from "./ParticleUtil.js";
+import { ParticleChild } from "./ParticleChild.js";
 import { TargetParser } from "./TargetParser.js";
 import { TargetUtil } from "./TargetUtil.js";
 import { TUtil } from "./TUtil.js";
-import { Child } from "./Child.js";
+import { getRunScheduler } from "./App.js";
 
 /**
  * It provides a TModel that can render instanced addChildren values on the GPU.
@@ -50,23 +51,20 @@ var ParticleTModel = /*#__PURE__*/function (_TModel) {
     var options = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : {};
     _classCallCheck(this, ParticleTModel);
     _this = _callSuper(this, ParticleTModel, [type, targets, oid, options]);
-    _this.particleValues = [];
+    _this.childActualValues = [];
+    _this.childTargetMaps = [];
     _this.particleValuesDirty = false;
     _this.particleRenderRequested = false;
     _this.childHandles = [];
     _this.childTargetValues = {};
     _this.childTransitions = {};
     _this.pendingGpuChildren = {};
-
-    /*
-     * Logical lightweight-child runtime state remains directly on the TModel
-     * so it can participate in runtime checkpointing.
-     */
     _this.childRuntimePrograms = [];
     _this.childRuntimeStates = [];
     _this.pendingGpuChildRuntimeCounts = {};
     _this.activeChildTransitionKey = undefined;
     _this.gpuChildrenEnabled = false;
+    _this.childGeneration = 0;
     _this.layoutEpoch = 0;
     _this.completeLayoutEpoch = -1;
     _this.layoutCompleteWaiters = [];
@@ -173,7 +171,7 @@ var ParticleTModel = /*#__PURE__*/function (_TModel) {
     key: "syncParticleRendererNow",
     value: function () {
       var _syncParticleRendererNow = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
-        var key, targetName, transition;
+        var key, targetName, transition, applied;
         return _regeneratorRuntime().wrap(function _callee3$(_context3) {
           while (1) switch (_context3.prev = _context3.next) {
             case 0:
@@ -183,12 +181,12 @@ var ParticleTModel = /*#__PURE__*/function (_TModel) {
               }
               return _context3.abrupt("return", false);
             case 2:
-              if (!this.particleValues.length) {
+              if (!this.childHandles.length) {
                 _context3.next = 7;
                 break;
               }
               _context3.next = 5;
-              return this.particleRenderer.setParticles(this.particleValues);
+              return this.particleRenderer.setParticles(this.childHandles);
             case 5:
               _context3.next = 9;
               break;
@@ -212,11 +210,14 @@ var ParticleTModel = /*#__PURE__*/function (_TModel) {
               return _context3.abrupt("return", true);
             case 16:
               _context3.next = 18;
-              return this.particleRenderer.setTargetParticles(transition.values, transition.steps);
+              return this.particleRenderer.setTargetParticles(transition.values, transition.steps, transition.generation);
             case 18:
-              this.handleSpecialTargetStep(key);
+              applied = _context3.sent;
+              if (applied && this.childTransitions[targetName] === transition) {
+                this.handleSpecialTargetStep(key);
+              }
               return _context3.abrupt("return", true);
-            case 20:
+            case 21:
             case "end":
               return _context3.stop();
           }
@@ -237,9 +238,13 @@ var ParticleTModel = /*#__PURE__*/function (_TModel) {
       this.particleRenderRequested = true;
       requestAnimationFrame(function () {
         _this3.particleRenderRequested = false;
+        if (_this3.activeChildTransitionKey) {
+          _this3.particleRenderer.render();
+          return;
+        }
         if (_this3.particleValuesDirty) {
           _this3.particleValuesDirty = false;
-          _this3.particleRenderer.updateParticles(_this3.particleValues);
+          _this3.particleRenderer.updateParticles(_this3.childHandles);
         } else {
           _this3.particleRenderer.render();
         }
@@ -265,7 +270,7 @@ var ParticleTModel = /*#__PURE__*/function (_TModel) {
             key = _ref2[0],
             propertyValue = _ref2[1];
           var cleanKey = TargetUtil.getTargetName(key);
-          return key === cleanKey && _this4.supportsChildTarget(cleanKey) && _this4.canRenderChildValue(propertyValue);
+          return key === cleanKey && ParticleUtil.isGpuTarget(cleanKey) && _this4.canRenderChildValue(propertyValue);
         });
       });
     }
@@ -286,11 +291,6 @@ var ParticleTModel = /*#__PURE__*/function (_TModel) {
       }
       return true;
     }
-  }, {
-    key: "supportsChildTarget",
-    value: function supportsChildTarget(key) {
-      return ParticleUtil.isGpuRenderTarget(key);
-    }
   }, {
     key: "affectsChildLayout",
     value: function affectsChildLayout(key) {
@@ -307,71 +307,56 @@ var ParticleTModel = /*#__PURE__*/function (_TModel) {
   }, {
     key: "getChildren",
     value: function getChildren() {
-      if (!this.gpuChildrenEnabled) {
-        return _superPropGet(ParticleTModel, "getChildren", this, 3)([]);
-      }
-      return this.childHandles;
+      var children = _superPropGet(ParticleTModel, "getChildren", this, 3)([]);
+      return this.gpuChildrenEnabled ? [].concat(_toConsumableArray(children), _toConsumableArray(this.childHandles)) : children;
     }
   }, {
     key: "getChildValue",
     value: function getChildValue(index, key) {
-      var _this$particleValues$;
-      return (_this$particleValues$ = this.particleValues[index]) === null || _this$particleValues$ === void 0 ? void 0 : _this$particleValues$[TargetUtil.getTargetName(key)];
+      var child = this.childHandles[index];
+      if (!child) {
+        return;
+      }
+      var cleanKey = ParticleUtil.getTargetName(key);
+      if ((cleanKey === "x" || cleanKey === "y") && !child.allTargetMap[cleanKey]) {
+        return child[cleanKey];
+      }
+      return child.actualValues[cleanKey];
     }
   }, {
     key: "setChildTarget",
-    value: function setChildTarget(index, key, target) {
-      var _this$childTargetValu, _this$childTargetValu2, _targetValues$index;
-      var targetName = TargetUtil.getTargetName(TargetUtil.currentTargetName);
-      var cleanKey = TargetUtil.getTargetName(key);
-      if (!targetName) {
+    value: function setChildTarget(index, key, target, steps, interval, easing) {
+      var originalTargetName = TargetUtil.currentTargetName;
+      var originalTModel = TargetUtil.currentTModel;
+      var cleanKey = ParticleUtil.getTargetName(key);
+      var child = this.childHandles[index];
+      if (!child) {
         return;
       }
-      if (key !== cleanKey || !this.supportsChildTarget(cleanKey)) {
-        throw new Error("GPU child target \"".concat(key, "\" is not supported yet."));
-      }
-      var targetValues = (_this$childTargetValu2 = (_this$childTargetValu = this.childTargetValues)[targetName]) !== null && _this$childTargetValu2 !== void 0 ? _this$childTargetValu2 : _this$childTargetValu[targetName] = [];
-      var childValues = (_targetValues$index = targetValues[index]) !== null && _targetValues$index !== void 0 ? _targetValues$index : targetValues[index] = {};
-      childValues[cleanKey] = TargetParser.isTargetSpecObject(target) ? _objectSpread({}, target) : {
-        value: target
-      };
+      child.allTargetMap[cleanKey] = key;
+      this.childTargetMaps[index] = child.allTargetMap;
+      this.particleRuntime.setImperativeTarget(index, cleanKey, target, steps, interval, easing, originalTargetName, originalTModel);
     }
   }, {
     key: "setChildValue",
     value: function setChildValue(index, key, value) {
-      var cleanKey = TargetUtil.getTargetName(key);
-      var childValues = this.particleValues[index];
-      if (!childValues || childValues[cleanKey] === value) {
-        return;
-      }
-      childValues[cleanKey] = value;
-      this.particleValuesDirty = true;
-      if (this.affectsChildLayout(cleanKey)) {
-        this.invalidateChildrenLayout();
-      }
+      var invalidateLayout = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : true;
       var child = this.childHandles[index];
-      if (child) {
-        child.actualValues[cleanKey] = value;
+      if (!child) {
+        return false;
       }
-    }
-  }, {
-    key: "setChildLayoutValue",
-    value: function setChildLayoutValue(index, key, value) {
-      var _this$getScrollLeft, _this$getScrollTop;
-      var childValues = this.particleValues[index];
-      if (!childValues) {
-        return;
+      var cleanKey = ParticleUtil.getTargetName(key);
+      if (child.actualValues[cleanKey] === value) {
+        return false;
       }
-      if (this.particleRuntime.isControlled(index, key)) {
-        return;
+      child.actualValues[cleanKey] = value;
+      if (ParticleUtil.isGpuTarget(cleanKey)) {
+        this.particleValuesDirty = true;
       }
-      var scrollOffset = key === "x" ? (_this$getScrollLeft = this.getScrollLeft()) !== null && _this$getScrollLeft !== void 0 ? _this$getScrollLeft : 0 : key === "y" ? (_this$getScrollTop = this.getScrollTop()) !== null && _this$getScrollTop !== void 0 ? _this$getScrollTop : 0 : 0;
-      var layoutValue = value + scrollOffset;
-      if (childValues[key] === layoutValue) {
-        return;
+      if (invalidateLayout && this.affectsChildLayout(cleanKey)) {
+        this.invalidateLayout();
       }
-      childValues[key] = layoutValue;
-      this.particleValuesDirty = true;
+      return true;
     }
   }, {
     key: "getChildTargetValues",
@@ -384,50 +369,155 @@ var ParticleTModel = /*#__PURE__*/function (_TModel) {
       var _this5 = this;
       var options = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
       var targetName = TargetUtil.getTargetName(key);
-      var values = new Array(this.particleValues.length);
-      var steps = new Array(this.particleValues.length);
       var defaultSteps = Math.max(0, Number(options.steps) || 0);
-      var maxSteps = defaultSteps;
-      for (var index = 0; index < this.particleValues.length; index++) {
-        var particle = this.particleValues[index];
+      var children = [];
+      var handledNonGpu = false;
+      for (var index = 0; index < targetValues.length; index++) {
         var targets = targetValues[index];
-        var nextParticle = _objectSpread({}, particle);
-        var childSteps = {};
-        if (targets) {
-          for (var _i = 0, _Object$entries = Object.entries(targets); _i < _Object$entries.length; _i++) {
-            var _Object$entries$_i = _slicedToArray(_Object$entries[_i], 2),
-              property = _Object$entries$_i[0],
-              rawTarget = _Object$entries$_i[1];
-            var target = TargetParser.isTargetSpecObject(rawTarget) ? rawTarget : {
-              value: rawTarget
-            };
-            nextParticle[property] = target.value;
-            var propertySteps = target.steps !== undefined ? Math.max(0, Number(target.steps) || 0) : defaultSteps;
-            childSteps[property] = propertySteps;
-            maxSteps = Math.max(maxSteps, propertySteps);
+        var child = this.childHandles[index];
+        if (!targets || !child) {
+          continue;
+        }
+        var transitionChild = {
+          index: index,
+          target: {},
+          steps: {},
+          loops: {},
+          valueLists: {}
+        };
+        for (var _i = 0, _Object$entries = Object.entries(targets); _i < _Object$entries.length; _i++) {
+          var _Object$entries$_i = _slicedToArray(_Object$entries[_i], 2),
+            property = _Object$entries$_i[0],
+            rawTarget = _Object$entries$_i[1];
+          var targetProperty = ParticleUtil.getTargetName(property);
+          if (!ParticleUtil.isGpuTarget(targetProperty)) {
+            var _TargetParser$getValu = TargetParser.getValueStepsCycles(child, targetProperty, rawTarget, 0),
+              _TargetParser$getValu2 = _slicedToArray(_TargetParser$getValu, 2),
+              _value = _TargetParser$getValu2[0],
+              steps = _TargetParser$getValu2[1];
+            if (!steps) {
+              this.setChildValue(index, targetProperty, _value);
+              handledNonGpu = true;
+            }
+            continue;
           }
+          var _TargetParser$getValu3 = TargetParser.getValueStepsCycles(child, targetProperty, rawTarget, 0),
+            _TargetParser$getValu4 = _slicedToArray(_TargetParser$getValu3, 2),
+            value = _TargetParser$getValu4[0],
+            parsedSteps = _TargetParser$getValu4[1];
+          var hasOwnSteps = TUtil.isDefined(rawTarget === null || rawTarget === void 0 ? void 0 : rawTarget.steps) || TargetParser.isValueStepsCycleArray(rawTarget === null || rawTarget === void 0 ? void 0 : rawTarget.value);
+          var propertySteps = hasOwnSteps ? parsedSteps : defaultSteps;
+          if (TargetParser.isListTarget(value)) {
+            transitionChild.valueLists[targetProperty] = value.list;
+            transitionChild.target[targetProperty] = value.list[1];
+          } else {
+            transitionChild.target[targetProperty] = value;
+          }
+          transitionChild.steps[targetProperty] = propertySteps;
+          transitionChild.loops[targetProperty] = (rawTarget === null || rawTarget === void 0 ? void 0 : rawTarget.loop) === true;
+        }
+        if (Object.keys(transitionChild.target).length) {
+          children.push(transitionChild);
         }
-        values[index] = nextParticle;
-        steps[index] = childSteps;
       }
-      this.childTransitions[targetName] = {
-        values: values,
-        steps: steps
+      if (!children.length) {
+        if (!handledNonGpu) {
+          return false;
+        }
+        delete this.childTargetValues[targetName];
+        return {
+          handled: true,
+          steps: 0
+        };
+      }
+      var segmentCount = this.getChildrenSegmentCount(children);
+      var segment = this.buildChildTransitionSegment(children, 0, defaultSteps);
+      this.commitImmediateChildTransitionValues(children, segment.values, segment.steps);
+      if (!segment.hasSegment || segment.maxSteps === 0) {
+        this.commitChildTransitionSegment(children, segment.values, segment.steps);
+        delete this.childTargetValues[targetName];
+        this.particleValuesDirty = true;
+        this.requestParticleRender();
+        return {
+          handled: true,
+          steps: 0
+        };
+      }
+      var transition = {
+        children: children,
+        segmentIndex: 0,
+        segmentCount: segmentCount,
+        defaultSteps: defaultSteps,
+        initialValues: segment.initialValues,
+        values: segment.values,
+        steps: segment.steps,
+        loops: segment.loops,
+        hasLoop: segment.hasLoop,
+        generation: this.childGeneration
       };
+      this.childTransitions[targetName] = transition;
       this.activeChildTransitionKey = key;
+      this.addChildTransitionLayoutTargets(transition);
       if (this.hasDom()) {
-        this.particleRenderer.setTargetParticles(values, steps).then(function () {
-          var _this5$childTransitio;
-          if (((_this5$childTransitio = _this5.childTransitions[targetName]) === null || _this5$childTransitio === void 0 ? void 0 : _this5$childTransitio.values) === values) {
+        this.particleRenderer.setTargetParticles(segment.values, segment.steps, transition.generation).then(function (applied) {
+          if (applied && _this5.childTransitions[targetName] === transition) {
             _this5.handleSpecialTargetStep(key);
           }
         });
       }
       return {
         handled: true,
-        steps: maxSteps
+        steps: segment.maxSteps
       };
     }
+  }, {
+    key: "commitChildTransitionSegment",
+    value: function commitChildTransitionSegment(children, values, steps) {
+      var _iterator = _createForOfIteratorHelper(children),
+        _step;
+      try {
+        for (_iterator.s(); !(_step = _iterator.n()).done;) {
+          var transitionChild = _step.value;
+          var index = transitionChild.index;
+          var child = this.childHandles[index];
+          var childSteps = steps === null || steps === void 0 ? void 0 : steps[index];
+          if (!child || !childSteps) {
+            continue;
+          }
+          var wasVisible = child.isVisible();
+          var layoutProperties = [];
+          for (var _i2 = 0, _Object$keys = Object.keys(childSteps); _i2 < _Object$keys.length; _i2++) {
+            var _values$index;
+            var property = _Object$keys[_i2];
+            child.actualValues[property] = (_values$index = values[index]) === null || _values$index === void 0 ? void 0 : _values$index[property];
+            if (ParticleUtil.affectsChildLayout(property)) {
+              layoutProperties.push(property);
+            }
+          }
+          if (layoutProperties.length) {
+            child.actualValues.isVisible = child.calcVisibility();
+            if (wasVisible || child.isVisible()) {
+              var _iterator2 = _createForOfIteratorHelper(layoutProperties),
+                _step2;
+              try {
+                for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
+                  var _property = _step2.value;
+                  child.removeFromNoDomUpdatingTargets(_property);
+                }
+              } catch (err) {
+                _iterator2.e(err);
+              } finally {
+                _iterator2.f();
+              }
+            }
+          }
+        }
+      } catch (err) {
+        _iterator.e(err);
+      } finally {
+        _iterator.f();
+      }
+    }
   }, {
     key: "handleSpecialTarget",
     value: function handleSpecialTarget(key, value) {
@@ -444,20 +534,20 @@ var ParticleTModel = /*#__PURE__*/function (_TModel) {
   }, {
     key: "getRenderScrollLeft",
     value: function getRenderScrollLeft() {
-      var _this$getParent$$dom;
-      return this.getScrollLeft() || ((_this$getParent$$dom = this.getParent().$dom) === null || _this$getParent$$dom === void 0 ? void 0 : _this$getParent$$dom.getScrollLeft()) || 0;
+      var _this$$dom;
+      return ((_this$$dom = this.$dom) === null || _this$$dom === void 0 ? void 0 : _this$$dom.getScrollLeft()) || this.getScrollLeft() || 0;
     }
   }, {
     key: "getRenderScrollTop",
     value: function getRenderScrollTop() {
-      var _this$getParent$$dom2;
-      return this.getScrollTop() || ((_this$getParent$$dom2 = this.getParent().$dom) === null || _this$getParent$$dom2 === void 0 ? void 0 : _this$getParent$$dom2.getScrollTop()) || 0;
+      var _this$$dom2;
+      return ((_this$$dom2 = this.$dom) === null || _this$$dom2 === void 0 ? void 0 : _this$$dom2.getScrollTop()) || this.getScrollTop() || 0;
     }
   }, {
     key: "addChild",
     value: function addChild(child) {
       var index = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : this.addedChildren.length + this.allChildrenList.length;
-      if (child && _typeof(child) === "object" && !(child instanceof TModel) && ParticleUtil.isGpuChildrenTarget(TargetUtil.currentTargetName)) {
+      if (child && _typeof(child) === "object" && !(child instanceof TModel) && ParticleUtil.isChildrenTarget(TargetUtil.currentTargetName)) {
         var renderer = this.getChildrenRenderer();
         if (renderer !== "dom") {
           var childDefinition = TUtil.cloneTargetDefinition(child);
@@ -474,27 +564,25 @@ var ParticleTModel = /*#__PURE__*/function (_TModel) {
     value: function addGpuChild(definition) {
       var key = TargetUtil.currentTargetName;
       var targetName = TargetUtil.getTargetName(key);
-      var index = this.particleValues.length;
+      var index = this.childHandles.length;
       this.gpuChildrenEnabled = true;
-
-      /*
-       * A placeholder and Child must exist before function-valued properties
-       * are resolved because functions can call Child getters.
-       */
-      this.particleValues[index] = {};
-      var handle = new Child(this, index);
+      var handle = new ParticleChild(this, index);
       this.childHandles[index] = handle;
+      this.childActualValues[index] = handle.actualValues;
+      this.childTargetMaps[index] = handle.allTargetMap;
       try {
         var _this$pendingGpuChild, _this$pendingGpuChild2;
-        var compiled = ParticleUtil.compileGpuChildDefinition(handle, definition);
+        var compiled = ParticleUtil.compileChildDefinition(handle, definition);
         var child = this.createGpuChild(compiled.renderDefinition);
         if (!child) {
-          this.particleValues.pop();
           this.childHandles.pop();
+          this.childActualValues.pop();
+          this.childTargetMaps.pop();
           return false;
         }
-        this.particleValues[index] = child.initial;
         Object.assign(handle.actualValues, child.initial);
+        this.childActualValues[index] = handle.actualValues;
+        this.childTargetMaps[index] = handle.allTargetMap;
         this.particleRuntime.registerChild(index, targetName, compiled);
         var pending = (_this$pendingGpuChild2 = (_this$pendingGpuChild = this.pendingGpuChildren)[targetName]) !== null && _this$pendingGpuChild2 !== void 0 ? _this$pendingGpuChild2 : _this$pendingGpuChild[targetName] = {
           key: key,
@@ -503,21 +591,108 @@ var ParticleTModel = /*#__PURE__*/function (_TModel) {
         pending.children.push(_objectSpread({
           index: index
         }, child));
+        this.childGeneration++;
         this.childrenUpdateFlag = true;
         this.markLayoutDirty("addGpuChild");
         return true;
       } catch (error) {
-        this.particleValues.pop();
         this.childHandles.pop();
+        this.childActualValues.pop();
+        this.childTargetMaps.pop();
         this.childRuntimePrograms.pop();
         this.childRuntimeStates.pop();
         throw error;
       }
     }
+  }, {
+    key: "removeChild",
+    value: function removeChild(child) {
+      if (!this.gpuChildrenEnabled || !(child instanceof ParticleChild)) {
+        return _superPropGet(ParticleTModel, "removeChild", this, 3)([child]);
+      }
+      var index = this.childHandles.indexOf(child);
+      if (index < 0) {
+        return;
+      }
+      this.particleRuntime.removeChild(index);
+      this.childHandles.splice(index, 1);
+      this.childActualValues.splice(index, 1);
+      this.childTargetMaps.splice(index, 1);
+      this.removeChildFromTransitions(index);
+      for (var _i3 = 0, _Object$values = Object.values(this.childTargetValues); _i3 < _Object$values.length; _i3++) {
+        var targetValues = _Object$values[_i3];
+        targetValues === null || targetValues === void 0 || targetValues.splice(index, 1);
+      }
+      child.index = -1;
+      for (var i = index; i < this.childHandles.length; i++) {
+        this.childHandles[i].index = i;
+      }
+      this.childGeneration++;
+      this.particleValuesDirty = true;
+      this.invalidateLayout();
+      this.markLayoutDirty("removeGpuChild");
+      this.requestParticleRender();
+      return this;
+    }
+  }, {
+    key: "removeChildFromTransitions",
+    value: function removeChildFromTransitions(index) {
+      for (var _i4 = 0, _Object$values2 = Object.values(this.childTransitions); _i4 < _Object$values2.length; _i4++) {
+        var _transition$initialVa, _transition$values, _transition$steps, _transition$loops;
+        var transition = _Object$values2[_i4];
+        (_transition$initialVa = transition.initialValues) === null || _transition$initialVa === void 0 || _transition$initialVa.splice(index, 1);
+        (_transition$values = transition.values) === null || _transition$values === void 0 || _transition$values.splice(index, 1);
+        (_transition$steps = transition.steps) === null || _transition$steps === void 0 || _transition$steps.splice(index, 1);
+        (_transition$loops = transition.loops) === null || _transition$loops === void 0 || _transition$loops.splice(index, 1);
+        if (transition.children) {
+          transition.children = transition.children.filter(function (child) {
+            return child.index !== index;
+          });
+          var _iterator3 = _createForOfIteratorHelper(transition.children),
+            _step3;
+          try {
+            for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
+              var child = _step3.value;
+              if (child.index > index) {
+                child.index--;
+              }
+            }
+          } catch (err) {
+            _iterator3.e(err);
+          } finally {
+            _iterator3.f();
+          }
+        }
+      }
+      for (var _i5 = 0, _Object$values3 = Object.values(this.pendingGpuChildren); _i5 < _Object$values3.length; _i5++) {
+        var pending = _Object$values3[_i5];
+        if (!(pending !== null && pending !== void 0 && pending.children)) {
+          continue;
+        }
+        pending.children = pending.children.filter(function (child) {
+          return child.index !== index;
+        });
+        var _iterator4 = _createForOfIteratorHelper(pending.children),
+          _step4;
+        try {
+          for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
+            var _child = _step4.value;
+            if (_child.index > index) {
+              _child.index--;
+            }
+          }
+        } catch (err) {
+          _iterator4.e(err);
+        } finally {
+          _iterator4.f();
+        }
+      }
+    }
   }, {
     key: "isTargetEnabled",
     value: function isTargetEnabled(key) {
-      if (ParticleUtil.isGpuChildrenTarget(key) && this.isExecuted(key) && this.particleRuntime.hasPending(key)) {
+      var target = this.targets[key];
+      if (ParticleUtil.isChildrenTarget(key) && (target === null || target === void 0 ? void 0 : target.waitForChildren) === true && this.isExecuted(key) && this.particleRuntime.hasPending(key)) {
         return false;
       }
       return _superPropGet(ParticleTModel, "isTargetEnabled", this, 3)([key]);
@@ -536,9 +711,9 @@ var ParticleTModel = /*#__PURE__*/function (_TModel) {
       var loops = {};
       var valueLists = {};
       var hasTransition = false;
-      for (var _i2 = 0, _Object$entries2 = Object.entries(definition); _i2 < _Object$entries2.length; _i2++) {
+      for (var _i6 = 0, _Object$entries2 = Object.entries(definition); _i6 < _Object$entries2.length; _i6++) {
         var _resolved$valueList;
-        var _Object$entries2$_i = _slicedToArray(_Object$entries2[_i2], 2),
+        var _Object$entries2$_i = _slicedToArray(_Object$entries2[_i6], 2),
           property = _Object$entries2$_i[0],
           value = _Object$entries2$_i[1];
         var resolved = this.resolveInitialChildProperty(value);
@@ -574,7 +749,7 @@ var ParticleTModel = /*#__PURE__*/function (_TModel) {
     value: function finalizeChildrenTarget(key) {
       var _this6 = this;
       var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
-      if (!ParticleUtil.isGpuChildrenTarget(key)) {
+      if (!ParticleUtil.isChildrenTarget(key)) {
         return false;
       }
       var targetName = TargetUtil.getTargetName(key);
@@ -582,34 +757,34 @@ var ParticleTModel = /*#__PURE__*/function (_TModel) {
       if (!(pending !== null && pending !== void 0 && pending.children.length)) {
         return false;
       }
-      this.invalidateChildrenLayout();
+      this.invalidateLayout();
       var defaultSteps = Math.max(0, Number(options.steps) || 0);
-      var currentValues = this.particleValues;
       var segmentCount = this.getChildrenSegmentCount(pending.children);
-      var segment = this.buildChildTransitionSegment(pending.children, 0, currentValues, defaultSteps);
+      var segment = this.buildChildTransitionSegment(pending.children, 0, defaultSteps);
+      this.commitImmediateChildTransitionValues(pending.children, segment.values, segment.steps);
       delete this.pendingGpuChildren[targetName];
       if (!segment.hasSegment || segment.maxSteps === 0) {
-        this.particleValues = segment.values;
+        this.commitChildTransitionSegment(pending.children, segment.values, segment.steps);
         var runtimeIndexes = pending.children.map(function (child) {
           return child.index;
         }).filter(function (index) {
-          var _this6$childRuntimePr;
-          return (_this6$childRuntimePr = _this6.childRuntimePrograms[index]) === null || _this6$childRuntimePr === void 0 ? void 0 : _this6$childRuntimePr.length;
+          var state = _this6.childRuntimeStates[index];
+          return state && !state.done;
         });
-        var _iterator = _createForOfIteratorHelper(runtimeIndexes),
-          _step;
+        var _iterator5 = _createForOfIteratorHelper(runtimeIndexes),
+          _step5;
         try {
-          for (_iterator.s(); !(_step = _iterator.n()).done;) {
-            var index = _step.value;
+          for (_iterator5.s(); !(_step5 = _iterator5.n()).done;) {
+            var index = _step5.value;
             this.particleRuntime.queueStart(index);
           }
         } catch (err) {
-          _iterator.e(err);
+          _iterator5.e(err);
         } finally {
-          _iterator.f();
+          _iterator5.f();
         }
         if (this.hasDom()) {
-          this.particleRenderer.setParticles(segment.values).then(function () {
+          this.particleRenderer.setParticles(this.childHandles).then(function () {
             _this6.particleRuntime.markRenderReady(runtimeIndexes);
           });
         }
@@ -618,22 +793,106 @@ var ParticleTModel = /*#__PURE__*/function (_TModel) {
           steps: 0
         };
       }
-      this.childTransitions[targetName] = {
+      var transition = {
         children: pending.children,
         segmentIndex: 0,
         segmentCount: segmentCount,
         defaultSteps: defaultSteps,
+        initialValues: segment.initialValues,
         values: segment.values,
         steps: segment.steps,
         loops: segment.loops,
-        hasLoop: segment.hasLoop
+        hasLoop: segment.hasLoop,
+        generation: this.childGeneration
       };
+      this.childTransitions[targetName] = transition;
       this.activeChildTransitionKey = key;
+      this.addChildTransitionLayoutTargets(transition);
       return {
         handled: true,
         steps: segment.maxSteps
       };
     }
+  }, {
+    key: "addChildTransitionLayoutTargets",
+    value: function addChildTransitionLayoutTargets(transition) {
+      var _iterator6 = _createForOfIteratorHelper(transition.children),
+        _step6;
+      try {
+        for (_iterator6.s(); !(_step6 = _iterator6.n()).done;) {
+          var _transition$steps2;
+          var transitionChild = _step6.value;
+          var index = transitionChild.index;
+          var child = this.childHandles[index];
+          var childSteps = (_transition$steps2 = transition.steps) === null || _transition$steps2 === void 0 ? void 0 : _transition$steps2[index];
+          if (!child || !childSteps) {
+            continue;
+          }
+          for (var _i7 = 0, _Object$entries3 = Object.entries(childSteps); _i7 < _Object$entries3.length; _i7++) {
+            var _Object$entries3$_i = _slicedToArray(_Object$entries3[_i7], 2),
+              property = _Object$entries3$_i[0],
+              steps = _Object$entries3$_i[1];
+            if (steps > 0 && ParticleUtil.affectsChildLayout(property)) {
+              child.addToNoDomUpdatingTargets(property);
+            }
+          }
+        }
+      } catch (err) {
+        _iterator6.e(err);
+      } finally {
+        _iterator6.f();
+      }
+    }
+  }, {
+    key: "catchupChildLayoutTargets",
+    value: function catchupChildLayoutTargets(child) {
+      var _child$noDomUpdatingT, _transition$initialVa2, _transition$values2, _transition$steps3;
+      if (!(child !== null && child !== void 0 && (_child$noDomUpdatingT = child.noDomUpdatingTargets) !== null && _child$noDomUpdatingT !== void 0 && _child$noDomUpdatingT.size) || child.index < 0) {
+        return false;
+      }
+      var key = this.activeChildTransitionKey;
+      if (!key) {
+        return false;
+      }
+      var targetName = TargetUtil.getTargetName(key);
+      var transition = this.childTransitions[targetName];
+      if (!transition || transition.generation !== this.childGeneration) {
+        return false;
+      }
+      var index = child.index;
+      var initialValues = (_transition$initialVa2 = transition.initialValues) === null || _transition$initialVa2 === void 0 ? void 0 : _transition$initialVa2[index];
+      var targetValues = (_transition$values2 = transition.values) === null || _transition$values2 === void 0 ? void 0 : _transition$values2[index];
+      var childSteps = (_transition$steps3 = transition.steps) === null || _transition$steps3 === void 0 ? void 0 : _transition$steps3[index];
+      if (!initialValues || !targetValues || !childSteps) {
+        return false;
+      }
+      var currentStep = Math.max(0, Number(this.getTargetStep(key)) || 0);
+      var changed = false;
+      for (var _i8 = 0, _arr = _toConsumableArray(child.noDomUpdatingTargets); _i8 < _arr.length; _i8++) {
+        var property = _arr[_i8];
+        if (!ParticleUtil.affectsChildLayout(property)) {
+          child.removeFromNoDomUpdatingTargets(property);
+          continue;
+        }
+        var initialValue = initialValues[property];
+        var targetValue = targetValues[property];
+        var steps = Math.max(0, Number(childSteps[property]) || 0);
+        if (!TUtil.isDefined(initialValue) || !TUtil.isDefined(targetValue)) {
+          child.removeFromNoDomUpdatingTargets(property);
+          continue;
+        }
+        var progress = steps === 0 ? 1 : Math.min(1, currentStep / steps);
+        var value = initialValue + (targetValue - initialValue) * progress;
+        if (child.actualValues[property] !== value) {
+          child.actualValues[property] = value;
+          changed = true;
+        }
+        if (progress === 1) {
+          child.removeFromNoDomUpdatingTargets(property);
+        }
+      }
+      return changed;
+    }
   }, {
     key: "advanceChildTransitionSegment",
     value: function advanceChildTransitionSegment(key, transition) {
@@ -645,13 +904,16 @@ var ParticleTModel = /*#__PURE__*/function (_TModel) {
       if (nextSegmentIndex >= transition.segmentCount) {
         return false;
       }
-      this.particleValues = transition.values;
+      this.commitChildTransitionSegment(transition.children, transition.values, transition.steps);
       this.particleRenderer.completeTransition();
-      var segment = this.buildChildTransitionSegment(transition.children, nextSegmentIndex, this.particleValues, transition.defaultSteps);
+      var segment = this.buildChildTransitionSegment(transition.children, nextSegmentIndex, transition.defaultSteps);
       transition.segmentIndex = nextSegmentIndex;
+      transition.initialValues = segment.initialValues;
       transition.values = segment.values;
       transition.steps = segment.steps;
       transition.loops = segment.loops;
+      this.commitImmediateChildTransitionValues(transition.children, segment.values, segment.steps);
+      this.addChildTransitionLayoutTargets(transition);
       var targetValue = this.targetValues[key];
       if (targetValue) {
         targetValue.steps = segment.maxSteps;
@@ -660,8 +922,8 @@ var ParticleTModel = /*#__PURE__*/function (_TModel) {
       this.resetTargetInitialValue(key);
       this.setTargetStatus(key, "updating");
       if (this.hasDom()) {
-        this.particleRenderer.setTargetParticles(segment.values, segment.steps).then(function () {
-          if (_this7.childTransitions[TargetUtil.getTargetName(key)] === transition) {
+        this.particleRenderer.setTargetParticles(segment.values, segment.steps, transition.generation).then(function (applied) {
+          if (applied && _this7.childTransitions[TargetUtil.getTargetName(key)] === transition) {
             _this7.handleSpecialTargetStep(key);
           }
         });
@@ -670,69 +932,78 @@ var ParticleTModel = /*#__PURE__*/function (_TModel) {
     }
   }, {
     key: "buildChildTransitionSegment",
-    value: function buildChildTransitionSegment(children, segmentIndex, currentValues, defaultSteps) {
-      var values = currentValues.map(function (value) {
-        return _objectSpread({}, value);
-      });
-      var steps = Array.from({
-        length: currentValues.length
-      }, function () {
-        return {};
-      });
-      var loops = Array.from({
-        length: currentValues.length
-      }, function () {
-        return {};
+    value: function buildChildTransitionSegment(children, segmentIndex, defaultSteps) {
+      var initialValues = new Array(this.childHandles.length);
+      var values = this.childHandles.map(function (child) {
+        return child === null || child === void 0 ? void 0 : child.actualValues;
       });
+      var steps = new Array(this.childHandles.length);
+      var loops = new Array(this.childHandles.length);
       var maxSteps = 0;
       var hasSegment = false;
       var hasLoop = false;
-      var _iterator2 = _createForOfIteratorHelper(children),
-        _step2;
+      var _iterator7 = _createForOfIteratorHelper(children),
+        _step7;
       try {
-        for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
-          var child = _step2.value;
-          var current = currentValues[child.index];
-          var target = _objectSpread({}, current);
-          for (var _i3 = 0, _Object$keys = Object.keys(child.target); _i3 < _Object$keys.length; _i3++) {
-            var property = _Object$keys[_i3];
-            var valueList = child.valueLists[property];
+        for (_iterator7.s(); !(_step7 = _iterator7.n()).done;) {
+          var transitionChild = _step7.value;
+          var index = transitionChild.index;
+          var child = this.childHandles[index];
+          if (!child) {
+            continue;
+          }
+          var current = _objectSpread(_objectSpread({}, child.actualValues), {}, {
+            x: this.getChildValue(index, "x"),
+            y: this.getChildValue(index, "y")
+          });
+          var initial = void 0;
+          var target = void 0;
+          var childSteps = void 0;
+          var childLoops = void 0;
+          for (var _i9 = 0, _Object$keys2 = Object.keys(transitionChild.target); _i9 < _Object$keys2.length; _i9++) {
+            var property = _Object$keys2[_i9];
+            var valueList = transitionChild.valueLists[property];
+            var value = void 0;
             if (valueList) {
               if (segmentIndex >= valueList.length - 1) {
                 continue;
               }
-              target[property] = valueList[segmentIndex + 1];
-              var _propertySteps = this.getChildPropertySteps(child, property, segmentIndex, defaultSteps);
-              steps[child.index][property] = _propertySteps;
-              loops[child.index][property] = child.loops[property] === true;
-              maxSteps = Math.max(maxSteps, _propertySteps);
-              hasSegment = true;
-              if (child.loops[property]) {
-                hasLoop = true;
+              value = valueList[segmentIndex + 1];
+            } else {
+              if (segmentIndex !== 0 || current[property] === transitionChild.target[property]) {
+                continue;
               }
-              continue;
+              value = transitionChild.target[property];
             }
-            if (segmentIndex !== 0 || current[property] === child.target[property]) {
-              continue;
-            }
-            target[property] = child.target[property];
-            var propertySteps = this.getChildPropertySteps(child, property, segmentIndex, defaultSteps);
-            steps[child.index][property] = propertySteps;
-            loops[child.index][property] = child.loops[property] === true;
+            var propertySteps = this.getChildPropertySteps(transitionChild, property, segmentIndex, defaultSteps);
+            initial || (initial = {});
+            target || (target = _objectSpread({}, current));
+            childSteps || (childSteps = {});
+            childLoops || (childLoops = {});
+            initial[property] = current[property];
+            target[property] = value;
+            childSteps[property] = propertySteps;
+            childLoops[property] = transitionChild.loops[property] === true;
             maxSteps = Math.max(maxSteps, propertySteps);
             hasSegment = true;
-            if (child.loops[property]) {
+            if (childLoops[property]) {
               hasLoop = true;
             }
           }
-          values[child.index] = target;
+          if (target) {
+            initialValues[index] = initial;
+            values[index] = target;
+            steps[index] = childSteps;
+            loops[index] = childLoops;
+          }
         }
       } catch (err) {
-        _iterator2.e(err);
+        _iterator7.e(err);
       } finally {
-        _iterator2.f();
+        _iterator7.f();
       }
       return {
+        initialValues: initialValues,
         values: values,
         steps: steps,
         loops: loops,
@@ -757,8 +1028,8 @@ var ParticleTModel = /*#__PURE__*/function (_TModel) {
     key: "getChildSegmentCount",
     value: function getChildSegmentCount(child) {
       var count = 0;
-      for (var _i4 = 0, _Object$values = Object.values(child.valueLists); _i4 < _Object$values.length; _i4++) {
-        var valueList = _Object$values[_i4];
+      for (var _i10 = 0, _Object$values4 = Object.values(child.valueLists); _i10 < _Object$values4.length; _i10++) {
+        var valueList = _Object$values4[_i10];
         count = Math.max(count, valueList.length - 1);
       }
       return count;
@@ -767,17 +1038,17 @@ var ParticleTModel = /*#__PURE__*/function (_TModel) {
     key: "getChildrenSegmentCount",
     value: function getChildrenSegmentCount(children) {
       var count = 0;
-      var _iterator3 = _createForOfIteratorHelper(children),
-        _step3;
+      var _iterator8 = _createForOfIteratorHelper(children),
+        _step8;
       try {
-        for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
-          var child = _step3.value;
+        for (_iterator8.s(); !(_step8 = _iterator8.n()).done;) {
+          var child = _step8.value;
           count = Math.max(count, this.getChildSegmentCount(child));
         }
       } catch (err) {
-        _iterator3.e(err);
+        _iterator8.e(err);
       } finally {
-        _iterator3.f();
+        _iterator8.f();
       }
       return count;
     }
@@ -794,7 +1065,8 @@ var ParticleTModel = /*#__PURE__*/function (_TModel) {
     key: "handleSpecialTargetStep",
     value: function handleSpecialTargetStep(key) {
       var targetName = TargetUtil.getTargetName(key);
-      if (!this.childTransitions[targetName]) {
+      var transition = this.childTransitions[targetName];
+      if (!transition || transition.generation !== this.childGeneration) {
         return false;
       }
       this.particleRenderer.setTransitionStep(this.getTargetStep(key));
@@ -808,6 +1080,17 @@ var ParticleTModel = /*#__PURE__*/function (_TModel) {
       if (!transition) {
         return false;
       }
+      if (transition.generation !== this.childGeneration) {
+        this.particleRenderer.completeTransition();
+        delete this.childTransitions[targetName];
+        delete this.childTargetValues[targetName];
+        if (this.activeChildTransitionKey === key) {
+          this.activeChildTransitionKey = undefined;
+        }
+        this.particleValuesDirty = true;
+        this.requestParticleRender();
+        return true;
+      }
       if (this.advanceChildTransitionSegment(key, transition)) {
         return true;
       }
@@ -815,7 +1098,7 @@ var ParticleTModel = /*#__PURE__*/function (_TModel) {
         this.restartChildTransition(key, transition);
         return true;
       }
-      this.particleValues = transition.values;
+      this.commitChildTransitionSegment(transition.children, transition.values, transition.steps);
       this.particleRenderer.completeTransition();
       delete this.childTransitions[targetName];
       delete this.childTargetValues[targetName];
@@ -870,16 +1153,25 @@ var ParticleTModel = /*#__PURE__*/function (_TModel) {
       this.resetTargetStep(key);
       this.resetTargetInitialValue(key);
       this.setTargetStatus(key, "updating");
+      this.addChildTransitionLayoutTargets(transition);
       this.handleSpecialTargetStep(key);
       return true;
     }
+  }, {
+    key: "shouldBeBracketed",
+    value: function shouldBeBracketed() {
+      if (this.gpuChildrenEnabled) {
+        return false;
+      }
+      return _superPropGet(ParticleTModel, "shouldBeBracketed", this, 3)([]);
+    }
   }, {
     key: "shouldCalculateChildren",
     value: function shouldCalculateChildren() {
       if (!this.gpuChildrenEnabled) {
         return _superPropGet(ParticleTModel, "shouldCalculateChildren", this, 3)([]);
       }
-      if (this.completeLayoutEpoch === this.layoutEpoch && !this.hasChildrenLayoutStateChanged()) {
+      if (!this.getDirtyLayout() && this.completeLayoutEpoch === this.layoutEpoch && !this.hasLayoutStateChanged()) {
         this.currentStatus = undefined;
         this.requestParticleRender();
         return false;
@@ -887,8 +1179,8 @@ var ParticleTModel = /*#__PURE__*/function (_TModel) {
       return _superPropGet(ParticleTModel, "shouldCalculateChildren", this, 3)([]);
     }
   }, {
-    key: "getChildrenLayoutState",
-    value: function getChildrenLayoutState() {
+    key: "getLayoutState",
+    value: function getLayoutState() {
       return [this.getWidth(), this.getHeight(), this.val("gap"), this.getPaddingTop(), this.getPaddingRight(), this.getPaddingBottom(), this.getPaddingLeft(), this.getContainerOverflowMode()];
     }
   }, {
@@ -899,11 +1191,15 @@ var ParticleTModel = /*#__PURE__*/function (_TModel) {
         return;
       }
       this.completeLayoutEpoch = epoch;
-      this.completeChildrenLayoutState = this.getChildrenLayoutState();
-      if (this.particleRuntime.resolveLayoutFunctions()) {
+      this.completeLayoutState = this.getLayoutState();
+      if (this.particleRuntime.resolveInitialTargets()) {
         this.requestParticleRender();
-        return;
+        if (this.completeLayoutEpoch !== this.layoutEpoch) {
+          getRunScheduler().schedule(0, "particleInitialTargets-".concat(this.oid));
+          return;
+        }
       }
+      this.particleRenderer.updateCanvasLayerWidthHeight();
       this.resolveLayoutCompleteWaiters();
       this.particleRuntime.startReady();
       var key = this.activeChildTransitionKey;
@@ -915,25 +1211,102 @@ var ParticleTModel = /*#__PURE__*/function (_TModel) {
       if (!transition) {
         return;
       }
-      transition.values = transition.values.map(function (target, index) {
-        return _objectSpread(_objectSpread({}, _this8.particleValues[index]), target);
-      });
-      if (this.restoringParticleRuntime || !this.hasDom()) {
+      var layoutProperties = ["x", "y", "width", "height"];
+      for (var index = 0; index < this.childHandles.length; index++) {
+        var _transition$steps4, _index, _transition$steps4$_i;
+        var child = this.childHandles[index];
+        if (!child) {
+          continue;
+        }
+        var target = transition.values[index];
+        if (!target || target === child.actualValues) {
+          target = _objectSpread({}, child.actualValues);
+          transition.values[index] = target;
+        }
+        var childSteps = (_transition$steps4$_i = (_transition$steps4 = transition.steps)[_index = index]) !== null && _transition$steps4$_i !== void 0 ? _transition$steps4$_i : _transition$steps4[_index] = {};
+        var _iterator9 = _createForOfIteratorHelper(layoutProperties),
+          _step9;
+        try {
+          for (_iterator9.s(); !(_step9 = _iterator9.n()).done;) {
+            var property = _step9.value;
+            if (Object.prototype.hasOwnProperty.call(childSteps, property)) {
+              continue;
+            }
+            var value = this.getChildValue(index, property);
+            if (!TUtil.isDefined(value)) {
+              continue;
+            }
+            target[property] = value;
+            childSteps[property] = 0;
+          }
+        } catch (err) {
+          _iterator9.e(err);
+        } finally {
+          _iterator9.f();
+        }
+      }
+      if (transition.generation !== this.childGeneration || this.restoringParticleRuntime || !this.hasDom()) {
         return;
       }
-      this.particleRenderer.setParticles(this.particleValues).then(function () {
-        return _this8.particleRenderer.setTargetParticles(transition.values, transition.steps);
-      }).then(function () {
-        if (_this8.childTransitions[targetName] === transition) {
+      var isCurrentTransition = function isCurrentTransition() {
+        return _this8.activeChildTransitionKey === key && _this8.childTransitions[targetName] === transition && transition.generation === _this8.childGeneration;
+      };
+      this.particleRenderer.setTargetParticles(transition.values, transition.steps, transition.generation).then(function (applied) {
+        if (applied && isCurrentTransition()) {
           _this8.handleSpecialTargetStep(key);
         }
       });
     }
   }, {
-    key: "hasChildrenLayoutStateChanged",
-    value: function hasChildrenLayoutStateChanged() {
-      var current = this.getChildrenLayoutState();
-      var previous = this.completeChildrenLayoutState;
+    key: "commitImmediateChildTransitionValues",
+    value: function commitImmediateChildTransitionValues(children, values, steps) {
+      var changed = false;
+      var _iterator10 = _createForOfIteratorHelper(children),
+        _step10;
+      try {
+        for (_iterator10.s(); !(_step10 = _iterator10.n()).done;) {
+          var transitionChild = _step10.value;
+          var index = transitionChild.index;
+          var child = this.childHandles[index];
+          var childSteps = steps === null || steps === void 0 ? void 0 : steps[index];
+          if (!child || !childSteps) {
+            continue;
+          }
+          var layoutChanged = false;
+          for (var _i11 = 0, _Object$entries4 = Object.entries(childSteps); _i11 < _Object$entries4.length; _i11++) {
+            var _values$index2;
+            var _Object$entries4$_i = _slicedToArray(_Object$entries4[_i11], 2),
+              property = _Object$entries4$_i[0],
+              propertySteps = _Object$entries4$_i[1];
+            if (propertySteps !== 0) {
+              continue;
+            }
+            var value = (_values$index2 = values[index]) === null || _values$index2 === void 0 ? void 0 : _values$index2[property];
+            if (child.actualValues[property] === value) {
+              continue;
+            }
+            child.actualValues[property] = value;
+            changed = true;
+            if (ParticleUtil.affectsChildLayout(property)) {
+              layoutChanged = true;
+            }
+          }
+          if (layoutChanged) {
+            child.actualValues.isVisible = child.calcVisibility();
+          }
+        }
+      } catch (err) {
+        _iterator10.e(err);
+      } finally {
+        _iterator10.f();
+      }
+      return changed;
+    }
+  }, {
+    key: "hasLayoutStateChanged",
+    value: function hasLayoutStateChanged() {
+      var current = this.getLayoutState();
+      var previous = this.completeLayoutState;
       if (!previous || current.length !== previous.length) {
         return true;
       }
@@ -942,14 +1315,14 @@ var ParticleTModel = /*#__PURE__*/function (_TModel) {
       });
     }
   }, {
-    key: "invalidateChildrenLayout",
-    value: function invalidateChildrenLayout() {
+    key: "invalidateLayout",
+    value: function invalidateLayout() {
       this.layoutEpoch++;
     }
   }, {
     key: "getParticleCount",
     value: function getParticleCount() {
-      return this.particleValues.length;
+      return this.childHandles.length;
     }
   }, {
     key: "excludeRuntimeSnapshotField",
@@ -960,15 +1333,25 @@ var ParticleTModel = /*#__PURE__*/function (_TModel) {
     key: "restoreRuntimeDerivedState",
     value: function restoreRuntimeDerivedState() {
       var _this9 = this;
-      this.childHandles = this.particleValues.map(function (value, index) {
-        return new Child(_this9, index);
+      this.particleRenderer.destroy();
+      this.childActualValues || (this.childActualValues = []);
+      this.childTargetMaps || (this.childTargetMaps = []);
+      this.childHandles = this.childActualValues.map(function (values, index) {
+        var child = new ParticleChild(_this9, index);
+        var targetMap = _this9.childTargetMaps[index] || {};
+        Object.assign(child.actualValues, values);
+        Object.assign(child.allTargetMap, targetMap);
+        _this9.childActualValues[index] = child.actualValues;
+        _this9.childTargetMaps[index] = child.allTargetMap;
+        return child;
       });
+      this.childGeneration = Number.isInteger(this.childGeneration) ? this.childGeneration : 0;
       this.particleValuesDirty = false;
       this.particleRenderRequested = false;
       this.pendingGpuChildren = {};
       this.layoutEpoch = 0;
-      this.completeLayoutEpoch = 0;
-      this.completeChildrenLayoutState = this.getChildrenLayoutState();
+      this.completeLayoutEpoch = -1;
+      this.completeLayoutState = undefined;
       this.layoutCompleteWaiters = [];
       this.particleSyncPromise = undefined;
       this.restoringParticleRuntime = true;
@@ -991,17 +1374,17 @@ var ParticleTModel = /*#__PURE__*/function (_TModel) {
     key: "resolveLayoutCompleteWaiters",
     value: function resolveLayoutCompleteWaiters() {
       var waiters = this.layoutCompleteWaiters.splice(0);
-      var _iterator4 = _createForOfIteratorHelper(waiters),
-        _step4;
+      var _iterator11 = _createForOfIteratorHelper(waiters),
+        _step11;
       try {
-        for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
-          var resolve = _step4.value;
+        for (_iterator11.s(); !(_step11 = _iterator11.n()).done;) {
+          var resolve = _step11.value;
           resolve();
         }
       } catch (err) {
-        _iterator4.e(err);
+        _iterator11.e(err);
       } finally {
-        _iterator4.f();
+        _iterator11.f();
       }
     }
   }]);
@@ -1010,11 +1393,11 @@ function isParticleTModel(targets) {
   if (!targets) {
     return false;
   }
-  for (var _i5 = 0, _Object$entries3 = Object.entries(targets); _i5 < _Object$entries3.length; _i5++) {
-    var _Object$entries3$_i = _slicedToArray(_Object$entries3[_i5], 2),
-      key = _Object$entries3$_i[0],
-      target = _Object$entries3$_i[1];
-    if (!ParticleUtil.isGpuChildrenTarget(key)) {
+  for (var _i12 = 0, _Object$entries5 = Object.entries(targets); _i12 < _Object$entries5.length; _i12++) {
+    var _Object$entries5$_i = _slicedToArray(_Object$entries5[_i12], 2),
+      key = _Object$entries5$_i[0],
+      target = _Object$entries5$_i[1];
+    if (!ParticleUtil.isChildrenTarget(key)) {
       continue;
     }
     if (!target || _typeof(target) !== "object") {