targetj 1.0.260 → 1.1.0

package/build/TargetManager.js

@@ -249,6 +249,7 @@ var TargetManager = /*#__PURE__*/function () {
   }, {
     key: "catchupTargetByElapsed",
     value: function catchupTargetByElapsed(tmodel, key) {
+      var _targetValue$valueLis4;
       var _ref = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {},
         _ref$fireEnd = _ref.fireEnd,
         fireEnd = _ref$fireEnd === void 0 ? false : _ref$fireEnd;
@@ -262,17 +263,16 @@ var TargetManager = /*#__PURE__*/function () {
       var step = progress.step;
       var valuePointer = progress.valuePointer;
       var cycle = progress.cycle;
-      var theValue = tmodel.getTargetValue(key);
-      var steps = tmodel.getTargetSteps(key);
       var cycles = tmodel.getTargetCycles(key);
       if (progress.done) {
-        var _targetValue$valueLis, _targetValue$valueLis2, _targetValue$valueLis3;
-        var finalValue = (_targetValue$valueLis = targetValue.valueList) !== null && _targetValue$valueLis !== void 0 && _targetValue$valueLis.length ? targetValue.valueList[targetValue.valueList.length - 1] : theValue;
+        var _targetValue$valueLis, _progress$steps, _targetValue$valueLis2, _targetValue$valueLis3;
+        var finalValue = (_targetValue$valueLis = targetValue.valueList) !== null && _targetValue$valueLis !== void 0 && _targetValue$valueLis.length ? targetValue.valueList[targetValue.valueList.length - 1] : tmodel.getTargetValue(key);
         tmodel.val(key, finalValue);
         tmodel.setActual(key, finalValue);
         tmodel.addToStyleTargetList(key);
-        targetValue.step = steps;
+        targetValue.step = (_progress$steps = progress.steps) !== null && _progress$steps !== void 0 ? _progress$steps : tmodel.getTargetSteps(key);
         targetValue.valuePointer = (_targetValue$valueLis2 = (_targetValue$valueLis3 = targetValue.valueList) === null || _targetValue$valueLis3 === void 0 ? void 0 : _targetValue$valueLis3.length) !== null && _targetValue$valueLis2 !== void 0 ? _targetValue$valueLis2 : valuePointer;
+        targetValue.value = finalValue;
         targetValue.cycle = cycles;
         delete targetValue.catchupAt;
         if (fireEnd) {
@@ -280,11 +280,23 @@ var TargetManager = /*#__PURE__*/function () {
         }
         return {
           done: true,
-          step: steps,
+          step: targetValue.step,
           cycle: cycles,
           valuePointer: targetValue.valuePointer
         };
       }
+      if ((_targetValue$valueLis4 = targetValue.valueList) !== null && _targetValue$valueLis4 !== void 0 && _targetValue$valueLis4.length) {
+        targetValue.valuePointer = valuePointer;
+        targetValue.initialValue = targetValue.valueList[valuePointer - 1];
+        targetValue.value = targetValue.valueList[valuePointer];
+        targetValue.steps = targetValue.stepList[(valuePointer - 1) % targetValue.stepList.length];
+        targetValue.interval = Array.isArray(targetValue.intervalList) ? targetValue.intervalList[(valuePointer - 1) % targetValue.intervalList.length] : targetValue.interval;
+        targetValue.easing = targetValue.easingList[(valuePointer - 1) % targetValue.easingList.length];
+      }
+      targetValue.step = step;
+      targetValue.cycle = cycle;
+      var theValue = tmodel.getTargetValue(key);
+      var steps = tmodel.getTargetSteps(key);
       var initialValue = tmodel.getTargetInitialValue(key);
       if (!TUtil.isDefined(initialValue)) {
         initialValue = this.resolveInitialValue(tmodel, key, theValue);
@@ -294,9 +306,6 @@ var TargetManager = /*#__PURE__*/function () {
       tmodel.val(key, value);
       tmodel.setActual(key, value);
       tmodel.addToStyleTargetList(key);
-      targetValue.step = step;
-      targetValue.valuePointer = valuePointer;
-      targetValue.cycle = cycle;
       return {
         done: false,
         step: step,
@@ -332,7 +341,7 @@ var TargetManager = /*#__PURE__*/function () {
       if (tmodel.canBeAnimated(state.cleanKey)) {
         this.animateActualValue(tmodel, key, targetValue, state, step, valuePointer);
       } else {
-        this.updateActualValue(tmodel, key, targetValue, state, step, valuePointer);
+        this.updateActualValue(tmodel, key, targetValue, state, step);
       }
     }
   }, {
@@ -385,7 +394,7 @@ var TargetManager = /*#__PURE__*/function () {
     }
   }, {
     key: "updateActualValue",
-    value: function updateActualValue(tmodel, key, targetValue, state, step, valuePointer) {
+    value: function updateActualValue(tmodel, key, targetValue, state, step) {
       if (step <= state.steps) {
         tmodel.incrementTargetStep(key, state.now, state.lastUpdateTime, state.interval, state.steps);
         var newValue = TModelUtil.easingMorph(tmodel, key, state.initialValue, state.theValue, step, state.steps);
@@ -398,27 +407,31 @@ var TargetManager = /*#__PURE__*/function () {
           return;
         }
       }
-      this.finishCurrentSegment(tmodel, key, targetValue, state, valuePointer);
+      this.finishCurrentSegment(tmodel, key, targetValue, state);
     }
   }, {
     key: "finishCurrentSegment",
-    value: function finishCurrentSegment(tmodel, key, targetValue, state, valuePointer) {
+    value: function finishCurrentSegment(tmodel, key, targetValue, state) {
       tmodel.val(key, state.theValue);
       tmodel.setActual(key, state.theValue);
       tmodel.addToStyleTargetList(key);
       targetValue.step = state.steps;
       tmodel.setLastUpdate(key);
       var scheduleTime = 1;
-      if (targetValue.valueList && valuePointer < targetValue.valueList.length) {
+      if (targetValue.valueList) {
         tmodel.incrementValueListPointer(key);
         var nextPointer = tmodel.getValueListPointer(key);
-        tmodel.resetTargetStep(key);
-        targetValue.initialValue = targetValue.value;
-        targetValue.value = targetValue.valueList[nextPointer];
-        targetValue.steps = targetValue.stepList[(nextPointer - 1) % targetValue.stepList.length];
-        targetValue.interval = Array.isArray(targetValue.intervalList) ? targetValue.intervalList[(nextPointer - 1) % targetValue.intervalList.length] : 0;
-        targetValue.easing = targetValue.easingList[(nextPointer - 1) % targetValue.easingList.length];
-        scheduleTime = state.interval;
+        if (nextPointer < targetValue.valueList.length) {
+          tmodel.resetTargetStep(key);
+          targetValue.initialValue = targetValue.value;
+          targetValue.value = targetValue.valueList[nextPointer];
+          targetValue.steps = targetValue.stepList[(nextPointer - 1) % targetValue.stepList.length];
+          targetValue.interval = Array.isArray(targetValue.intervalList) ? targetValue.intervalList[(nextPointer - 1) % targetValue.intervalList.length] : 0;
+          targetValue.easing = targetValue.easingList[(nextPointer - 1) % targetValue.easingList.length];
+          scheduleTime = state.interval;
+        } else {
+          this.fireOnEnd(tmodel, key);
+        }
       } else {
         this.fireOnEnd(tmodel, key);
       }

package/build/TargetParser.js

@@ -9,6 +9,7 @@ import { TargetData } from './TargetData.js';
 import { TUtil } from './TUtil.js';
 import { TModel } from "./TModel.js";
 import { Easing } from "./Easing.js";
+import { getEvents } from "./App.js";
 
 /**
  * It provides helper functions for classify target types
@@ -114,7 +115,25 @@ var TargetParser = /*#__PURE__*/function () {
   }, {
     key: "getInstanceTargetValue",
     value: function getInstanceTargetValue(tmodel, key, target, cycle, lastValue, instance) {
-      return TUtil.runTargetValue(tmodel, target, key, cycle, lastValue, instance);
+      return TargetParser.runTargetValue(tmodel, target, key, cycle, lastValue, instance);
+    }
+  }, {
+    key: "runTargetValue",
+    value: function runTargetValue(tmodel, target, key, cycle, lastValue) {
+      var instance = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : undefined;
+      var cleanKey = TargetUtil.getTargetName(key);
+      var isExternalEvent = TargetData.allEventMap[cleanKey];
+      var instanceArgs = TUtil.isDefined(instance) ? [instance] : [];
+      if (isExternalEvent) {
+        var _target$value;
+        return typeof target.value === 'function' ? (_target$value = target.value).call.apply(_target$value, [tmodel].concat(instanceArgs, [getEvents().getCurrentOriginalEvent(), cycle, lastValue])) : TUtil.isDefined(target.value) ? target.value : target;
+      } else if (tmodel.val("___".concat(key))) {
+        var _target$value2;
+        return typeof target.value === 'function' ? (_target$value2 = target.value).call.apply(_target$value2, [tmodel].concat(instanceArgs, [tmodel.val("___".concat(key)), cycle, lastValue])) : TUtil.isDefined(target.value) ? target.value : target;
+      } else {
+        var _target$value3;
+        return typeof target.value === 'function' ? (_target$value3 = target.value).call.apply(_target$value3, [tmodel].concat(instanceArgs, [cycle, lastValue])) : TUtil.isDefined(target.value) ? target.value : target;
+      }
     }
   }, {
     key: "isChildrenTarget",
@@ -273,7 +292,7 @@ var TargetParser = /*#__PURE__*/function () {
 
         // Plain objects: compute value + params (steps/interval/easing/cycles)
         if (_typeof(target) === "object" && target !== null && Object.getPrototypeOf(target) === Object.prototype) {
-          var valueResult = TUtil.runTargetValue(tmodel, target, key, cycle, lastValue, instance);
+          var valueResult = TargetParser.runTargetValue(tmodel, target, key, cycle, lastValue, instance);
           if (TargetParser.isPrimitiveArray(valueResult) && (TUtil.isDefined(target.steps) || TUtil.isDefined(target.interval) || TUtil.isDefined(target.easing) || TUtil.isDefined(target.cycles))) {
             value = {
               list: valueResult

package/build/TargetUtil.js

@@ -572,6 +572,9 @@ var TargetUtil = /*#__PURE__*/function () {
         if (tmodel.isTargetImperative(targetName)) {
           continue;
         }
+        if (tmodel.isTargetComplete(targetName)) {
+          continue;
+        }
         if (tmodel.activatedTargets.indexOf(targetName) >= 0) {
           return "activated targets";
         }
@@ -591,7 +594,7 @@ var TargetUtil = /*#__PURE__*/function () {
     value: function isTargetTreeComplete(tmodel, key, completionScopeOverride) {
       var target = tmodel.targets[key];
       if (target) {
-        var _target$childAction, _target$childAction2, _target$childAction3;
+        var _target$childAction, _target$childAction2, _target$childAction3, _tmodel$particleRunti;
         var completionScope = completionScopeOverride !== null && completionScopeOverride !== void 0 ? completionScopeOverride : target.completionScope;
         var targetType = _typeof(target.value);
         if (TargetData.controlTargetMap[key]) {
@@ -621,6 +624,9 @@ var TargetUtil = /*#__PURE__*/function () {
         if (target.fetchAction && !getLoader().isLoadingSuccessful(tmodel, key)) {
           return 'incomplete loading';
         }
+        if ((_tmodel$particleRunti = tmodel.particleRuntime) !== null && _tmodel$particleRunti !== void 0 && _tmodel$particleRunti.hasPending(key, completionScope)) {
+          return "pending GPU children";
+        }
       }
       return true;
     }
@@ -635,7 +641,14 @@ var TargetUtil = /*#__PURE__*/function () {
         _step2;
       try {
         for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
+          var _child$visibilityStat;
           var child = _step2.value;
+          if (!child) {
+            continue;
+          }
+          if (completionScope === "visible" && !child.isLightweightChild && ((_child$visibilityStat = child.visibilityStatus) === null || _child$visibilityStat === void 0 ? void 0 : _child$visibilityStat.isVisible) === undefined) {
+            return "visibility not calculated";
+          }
           if (TargetUtil.shouldIgnoreChildForCompletion(child, completionScope)) {
             continue;
           }
@@ -761,8 +774,13 @@ var TargetUtil = /*#__PURE__*/function () {
         return true;
       }
       if (completionScope === "visible") {
-        var _child$visibilityStat;
-        return ((_child$visibilityStat = child.visibilityStatus) === null || _child$visibilityStat === void 0 ? void 0 : _child$visibilityStat.isVisible) !== true;
+        if (child.visibilityStatus) {
+          return child.visibilityStatus.isVisible !== true;
+        }
+        if (typeof child.isVisible === "function") {
+          return child.isVisible() !== true;
+        }
+        return true;
       }
       return false;
     }
@@ -925,6 +943,9 @@ var TargetUtil = /*#__PURE__*/function () {
     value: function resetTargetChildState(tmodel) {
       var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
       var visited = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : new Set();
+      if (tmodel.isLightweightChild) {
+        return;
+      }
       var sig = "".concat(tmodel.oid);
       if (visited.has(sig)) {
         return;

package/build/VisibilityUtil.js

@@ -68,7 +68,8 @@ var VisibilityUtil = /*#__PURE__*/function () {
         tmodel = parent;
       }
       var clip = VisibilityUtil.getScreenViewportRect();
-      var isVisible = VisibilityUtil.rectsOverlap(rect, clip);
+      var verticalOnly = tmodel.type === "BI";
+      var isVisible = VisibilityUtil.rectsOverlap(rect, clip, verticalOnly);
       if (!isVisible) {
         return {
           clip: clip,
@@ -115,7 +116,8 @@ var VisibilityUtil = /*#__PURE__*/function () {
   }, {
     key: "rectsOverlap",
     value: function rectsOverlap(a, b) {
-      return a.x <= b.r && a.r >= b.x && a.y <= b.b && a.b >= b.y;
+      var verticalOnly = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
+      return (verticalOnly || a.x <= b.r && a.r >= b.x) && a.y <= b.b && a.b >= b.y;
     }
   }, {
     key: "intersectRects",

package/build/index.js

@@ -20,6 +20,7 @@ export * from "./VisibilityUtil.js";
 export * from "./ScheduleUtil.js";
 export * from "./StateUtil.js";
 export * from "./ParticleTModel.js";
+export * from "./ParticleChild.js";
 export * from "./ParticleRenderer.js";
 export * from "./ParticleRuntime.js";
 export * from "./ParticleUtil.js";