@visactor/vchart 2.1.0-alpha.0 → 2.1.0-alpha.1

package/build/index.es.js

@@ -43347,9 +43347,17 @@ class PulseAnimate extends ACustomAnimate {
   }
 }
 
+const clipPathGeometryAttrs = {
+  x: !0,
+  y: !0,
+  x1: !0,
+  y1: !0,
+  width: !0,
+  height: !0
+};
 class Update extends ACustomAnimate {
   constructor(from, to, duration, easing, params) {
-    super(from, to, duration, easing, params);
+    super(from, to, duration, easing, params), this.clipPathSyncKeys = null, this.clipPathSyncParent = null, this.clipPathSyncChildIndex = -1, this.clipPathSyncDisabled = !1;
   }
   onBind() {
     var _a, _b;
@@ -43362,12 +43370,25 @@ class Update extends ACustomAnimate {
     } = this.params;
     diffAttrs = Object.assign({}, diffAttrs), (null === (_b = null == options ? void 0 : options.excludeChannels) || void 0 === _b ? void 0 : _b.length) && options.excludeChannels.forEach(channel => {
       delete diffAttrs[channel];
-    }), this.props = diffAttrs;
+    }), this.props = diffAttrs, this.clipPathSyncKeys = Object.keys(diffAttrs).filter(key => clipPathGeometryAttrs[key]), this.clipPathSyncDisabled = !this.clipPathSyncKeys.length, this.syncParentClipPathToTarget();
+  }
+  getStaticCommitAttrs() {
+    var _a;
+    if (!this.props) return null;
+    const target = this.target,
+      contextFinalAttrs = null === (_a = target.context) || void 0 === _a ? void 0 : _a.finalAttrs,
+      finalAttribute = "function" == typeof target.getFinalAttribute ? target.getFinalAttribute() : target.finalAttribute,
+      commitAttrs = {};
+    return Object.keys(this.props).forEach(key => {
+      contextFinalAttrs && Object.prototype.hasOwnProperty.call(contextFinalAttrs, key) ? commitAttrs[key] = contextFinalAttrs[key] : finalAttribute && Object.prototype.hasOwnProperty.call(finalAttribute, key) ? commitAttrs[key] = finalAttribute[key] : this.animate.validAttr(key) && (commitAttrs[key] = this.props[key]);
+    }), Object.keys(commitAttrs).length ? commitAttrs : null;
   }
   onEnd(cb) {
-    cb ? super.onEnd(cb) : (this.props && Object.keys(this.props).length && this.target.setAttributes(this.props, !1, {
+    if (cb) return void super.onEnd(cb);
+    const commitAttrs = this.getStaticCommitAttrs();
+    commitAttrs && this.target.setAttributes(commitAttrs, !1, {
       type: AttributeUpdateType.ANIMATE_END
-    }), super.onEnd());
+    }), this.syncParentClipPathToTarget(), super.onEnd();
   }
   update(end, ratio, out) {
     if (this.onStart(), !this.props || !this.propKeys) return;
@@ -43376,7 +43397,58 @@ class Update extends ACustomAnimate {
       if (!this.animate.validAttr(this.propKeys[index])) return;
       const key = this.propKeys[index];
       func(key, this.fromProps[key], this.props[key], easedRatio, this, this.target);
-    }), this.onUpdate(end, easedRatio, out);
+    }), this.syncParentClipPathToTarget(), this.onUpdate(end, easedRatio, out);
+  }
+  syncParentClipPathToTarget() {
+    var _a, _b;
+    if (this.clipPathSyncDisabled) return;
+    const target = this.target,
+      parent = target.parent,
+      path = null === (_a = null == parent ? void 0 : parent.attribute) || void 0 === _a ? void 0 : _a.path;
+    if (!(null === (_b = null == parent ? void 0 : parent.attribute) || void 0 === _b ? void 0 : _b.clip) || !Array.isArray(path) || !path.length) return;
+    const childIndex = this.getClipPathSyncChildIndex(parent);
+    if (childIndex < 0 || childIndex >= path.length) return;
+    const clipGraphic = path[childIndex];
+    if (!(null == clipGraphic ? void 0 : clipGraphic.attribute) || clipGraphic.type !== target.type || !this.isClipPathStaticTarget(clipGraphic)) return;
+    const syncAttrs = this.buildClipPathTransientAttrs(clipGraphic);
+    syncAttrs && applyAnimationTransientAttributes(clipGraphic, syncAttrs, AttributeUpdateType.ANIMATE_UPDATE);
+  }
+  getClipPathSyncChildIndex(parent) {
+    var _a;
+    if (this.clipPathSyncParent === parent && this.clipPathSyncChildIndex >= 0) return this.clipPathSyncChildIndex;
+    const target = this.target;
+    let childIndex = -1;
+    return null === (_a = parent.forEachChildren) || void 0 === _a || _a.call(parent, (child, index) => child === target && (childIndex = index, !0)), this.clipPathSyncParent = parent, this.clipPathSyncChildIndex = childIndex, childIndex;
+  }
+  isClipPathStaticTarget(clipGraphic) {
+    var _a, _b;
+    const target = this.target,
+      targetFinalAttrs = this.getTargetFinalAttrs(),
+      clipGraphicFinalAttrs = "function" == typeof clipGraphic.getFinalAttribute ? clipGraphic.getFinalAttribute() : clipGraphic.finalAttribute,
+      clipFinalAttrs = null !== (_a = null != clipGraphicFinalAttrs ? clipGraphicFinalAttrs : clipGraphic.baseAttributes) && void 0 !== _a ? _a : clipGraphic.attribute,
+      keys = null !== (_b = this.clipPathSyncKeys) && void 0 !== _b ? _b : [];
+    return !!(keys.length && targetFinalAttrs && clipFinalAttrs) && keys.every(key => {
+      var _a, _b;
+      return this.isSameClipPathValue(clipFinalAttrs[key], null !== (_a = targetFinalAttrs[key]) && void 0 !== _a ? _a : null === (_b = target.attribute) || void 0 === _b ? void 0 : _b[key]);
+    });
+  }
+  getTargetFinalAttrs() {
+    var _a, _b, _c;
+    const target = this.target;
+    return null !== (_c = null !== (_b = null === (_a = target.context) || void 0 === _a ? void 0 : _a.finalAttrs) && void 0 !== _b ? _b : "function" == typeof target.getFinalAttribute ? target.getFinalAttribute() : target.finalAttribute) && void 0 !== _c ? _c : null;
+  }
+  isSameClipPathValue(a, b) {
+    return "number" == typeof a && "number" == typeof b ? Math.abs(a - b) < 1e-8 : a === b;
+  }
+  buildClipPathTransientAttrs(clipGraphic) {
+    var _a;
+    const target = this.target,
+      attrs = {};
+    return (null !== (_a = this.clipPathSyncKeys) && void 0 !== _a ? _a : []).forEach(key => {
+      var _a;
+      const nextValue = null === (_a = target.attribute) || void 0 === _a ? void 0 : _a[key];
+      Object.prototype.hasOwnProperty.call(clipGraphic.attribute, key) && void 0 !== nextValue && !this.isSameClipPathValue(clipGraphic.attribute[key], nextValue) && (attrs[key] = nextValue);
+    }), Object.keys(attrs).length ? attrs : null;
   }
 }
 

package/build/index.js

@@ -43353,9 +43353,17 @@
       }
     }
 
+    const clipPathGeometryAttrs = {
+      x: !0,
+      y: !0,
+      x1: !0,
+      y1: !0,
+      width: !0,
+      height: !0
+    };
     class Update extends ACustomAnimate {
       constructor(from, to, duration, easing, params) {
-        super(from, to, duration, easing, params);
+        super(from, to, duration, easing, params), this.clipPathSyncKeys = null, this.clipPathSyncParent = null, this.clipPathSyncChildIndex = -1, this.clipPathSyncDisabled = !1;
       }
       onBind() {
         var _a, _b;
@@ -43368,12 +43376,25 @@
         } = this.params;
         diffAttrs = Object.assign({}, diffAttrs), (null === (_b = null == options ? void 0 : options.excludeChannels) || void 0 === _b ? void 0 : _b.length) && options.excludeChannels.forEach(channel => {
           delete diffAttrs[channel];
-        }), this.props = diffAttrs;
+        }), this.props = diffAttrs, this.clipPathSyncKeys = Object.keys(diffAttrs).filter(key => clipPathGeometryAttrs[key]), this.clipPathSyncDisabled = !this.clipPathSyncKeys.length, this.syncParentClipPathToTarget();
+      }
+      getStaticCommitAttrs() {
+        var _a;
+        if (!this.props) return null;
+        const target = this.target,
+          contextFinalAttrs = null === (_a = target.context) || void 0 === _a ? void 0 : _a.finalAttrs,
+          finalAttribute = "function" == typeof target.getFinalAttribute ? target.getFinalAttribute() : target.finalAttribute,
+          commitAttrs = {};
+        return Object.keys(this.props).forEach(key => {
+          contextFinalAttrs && Object.prototype.hasOwnProperty.call(contextFinalAttrs, key) ? commitAttrs[key] = contextFinalAttrs[key] : finalAttribute && Object.prototype.hasOwnProperty.call(finalAttribute, key) ? commitAttrs[key] = finalAttribute[key] : this.animate.validAttr(key) && (commitAttrs[key] = this.props[key]);
+        }), Object.keys(commitAttrs).length ? commitAttrs : null;
       }
       onEnd(cb) {
-        cb ? super.onEnd(cb) : (this.props && Object.keys(this.props).length && this.target.setAttributes(this.props, !1, {
+        if (cb) return void super.onEnd(cb);
+        const commitAttrs = this.getStaticCommitAttrs();
+        commitAttrs && this.target.setAttributes(commitAttrs, !1, {
           type: AttributeUpdateType.ANIMATE_END
-        }), super.onEnd());
+        }), this.syncParentClipPathToTarget(), super.onEnd();
       }
       update(end, ratio, out) {
         if (this.onStart(), !this.props || !this.propKeys) return;
@@ -43382,7 +43403,58 @@
           if (!this.animate.validAttr(this.propKeys[index])) return;
           const key = this.propKeys[index];
           func(key, this.fromProps[key], this.props[key], easedRatio, this, this.target);
-        }), this.onUpdate(end, easedRatio, out);
+        }), this.syncParentClipPathToTarget(), this.onUpdate(end, easedRatio, out);
+      }
+      syncParentClipPathToTarget() {
+        var _a, _b;
+        if (this.clipPathSyncDisabled) return;
+        const target = this.target,
+          parent = target.parent,
+          path = null === (_a = null == parent ? void 0 : parent.attribute) || void 0 === _a ? void 0 : _a.path;
+        if (!(null === (_b = null == parent ? void 0 : parent.attribute) || void 0 === _b ? void 0 : _b.clip) || !Array.isArray(path) || !path.length) return;
+        const childIndex = this.getClipPathSyncChildIndex(parent);
+        if (childIndex < 0 || childIndex >= path.length) return;
+        const clipGraphic = path[childIndex];
+        if (!(null == clipGraphic ? void 0 : clipGraphic.attribute) || clipGraphic.type !== target.type || !this.isClipPathStaticTarget(clipGraphic)) return;
+        const syncAttrs = this.buildClipPathTransientAttrs(clipGraphic);
+        syncAttrs && applyAnimationTransientAttributes(clipGraphic, syncAttrs, AttributeUpdateType.ANIMATE_UPDATE);
+      }
+      getClipPathSyncChildIndex(parent) {
+        var _a;
+        if (this.clipPathSyncParent === parent && this.clipPathSyncChildIndex >= 0) return this.clipPathSyncChildIndex;
+        const target = this.target;
+        let childIndex = -1;
+        return null === (_a = parent.forEachChildren) || void 0 === _a || _a.call(parent, (child, index) => child === target && (childIndex = index, !0)), this.clipPathSyncParent = parent, this.clipPathSyncChildIndex = childIndex, childIndex;
+      }
+      isClipPathStaticTarget(clipGraphic) {
+        var _a, _b;
+        const target = this.target,
+          targetFinalAttrs = this.getTargetFinalAttrs(),
+          clipGraphicFinalAttrs = "function" == typeof clipGraphic.getFinalAttribute ? clipGraphic.getFinalAttribute() : clipGraphic.finalAttribute,
+          clipFinalAttrs = null !== (_a = null != clipGraphicFinalAttrs ? clipGraphicFinalAttrs : clipGraphic.baseAttributes) && void 0 !== _a ? _a : clipGraphic.attribute,
+          keys = null !== (_b = this.clipPathSyncKeys) && void 0 !== _b ? _b : [];
+        return !!(keys.length && targetFinalAttrs && clipFinalAttrs) && keys.every(key => {
+          var _a, _b;
+          return this.isSameClipPathValue(clipFinalAttrs[key], null !== (_a = targetFinalAttrs[key]) && void 0 !== _a ? _a : null === (_b = target.attribute) || void 0 === _b ? void 0 : _b[key]);
+        });
+      }
+      getTargetFinalAttrs() {
+        var _a, _b, _c;
+        const target = this.target;
+        return null !== (_c = null !== (_b = null === (_a = target.context) || void 0 === _a ? void 0 : _a.finalAttrs) && void 0 !== _b ? _b : "function" == typeof target.getFinalAttribute ? target.getFinalAttribute() : target.finalAttribute) && void 0 !== _c ? _c : null;
+      }
+      isSameClipPathValue(a, b) {
+        return "number" == typeof a && "number" == typeof b ? Math.abs(a - b) < 1e-8 : a === b;
+      }
+      buildClipPathTransientAttrs(clipGraphic) {
+        var _a;
+        const target = this.target,
+          attrs = {};
+        return (null !== (_a = this.clipPathSyncKeys) && void 0 !== _a ? _a : []).forEach(key => {
+          var _a;
+          const nextValue = null === (_a = target.attribute) || void 0 === _a ? void 0 : _a[key];
+          Object.prototype.hasOwnProperty.call(clipGraphic.attribute, key) && void 0 !== nextValue && !this.isSameClipPathValue(clipGraphic.attribute[key], nextValue) && (attrs[key] = nextValue);
+        }), Object.keys(attrs).length ? attrs : null;
       }
     }