@visactor/vrender-core 0.19.6-alpha.3 → 0.19.6

package/cjs/graphic/graphic.js

@@ -66,8 +66,9 @@ class Graphic extends node_tree_1.Node {
         return this.tryUpdateGlobalTransMatrix(!0);
     }
     constructor(params = {}) {
+        var _a;
         super(), this._AABBBounds = new vutils_1.AABBBounds, this._updateTag = enums_1.UpdateTag.INIT, 
-        this.attribute = params, this.valid = this.isValid(), params.background ? this.loadImage(params.background.background ?? params.background, !0) : params.shadowGraphic && this.setShadowGraphic(params.shadowGraphic);
+        this.attribute = params, this.valid = this.isValid(), params.background ? this.loadImage(null !== (_a = params.background.background) && void 0 !== _a ? _a : params.background, !0) : params.shadowGraphic && this.setShadowGraphic(params.shadowGraphic);
     }
     setMode(mode) {
         "3d" === mode ? this.set3dMode() : this.set2dMode();
@@ -79,10 +80,11 @@ class Graphic extends node_tree_1.Node {
         this.in3dMode = !1;
     }
     getOffsetXY(attr, includeScroll = !1) {
+        var _a, _b;
         const {dx: dx = attr.dx, dy: dy = attr.dy} = this.attribute;
         if (includeScroll && this.parent) {
             const attribute = this.parent.attribute;
-            point.x = dx + (attribute.scrollX ?? 0), point.y = dy + (attribute.scrollY ?? 0);
+            point.x = dx + (null !== (_a = attribute.scrollX) && void 0 !== _a ? _a : 0), point.y = dy + (null !== (_b = attribute.scrollY) && void 0 !== _b ? _b : 0);
         } else point.x = dx, point.y = dy;
         return point;
     }
@@ -135,8 +137,9 @@ class Graphic extends node_tree_1.Node {
         return !!(this._updateTag & enums_1.UpdateTag.UPDATE_LOCAL_MATRIX);
     }
     isValid() {
+        var _a, _b;
         const attribute = this.attribute;
-        return Number.isFinite((attribute.x ?? 0) + (attribute.y ?? 0));
+        return Number.isFinite((null !== (_a = attribute.x) && void 0 !== _a ? _a : 0) + (null !== (_b = attribute.y) && void 0 !== _b ? _b : 0));
     }
     _validNumber(num) {
         return null == num || Number.isFinite(num);
@@ -173,10 +176,11 @@ class Graphic extends node_tree_1.Node {
         this.addUpdatePositionTag(), this.addUpdateLayoutTag(), this.onAttributeUpdate(context);
     }
     setAttribute(key, value, forceUpdateTag, context) {
+        var _a;
         const params = this.onBeforeAttributeUpdate && this.onBeforeAttributeUpdate({
             [key]: value
         }, this.attribute, key, context);
-        params ? this._setAttributes(params, forceUpdateTag, context) : (0, vutils_1.isNil)(this.normalAttrs?.[key]) ? (this.attribute[key] = value, 
+        params ? this._setAttributes(params, forceUpdateTag, context) : (0, vutils_1.isNil)(null === (_a = this.normalAttrs) || void 0 === _a ? void 0 : _a[key]) ? (this.attribute[key] = value, 
         this.valid = this.isValid(), this.updateShapeAndBoundsTagSetted() || !forceUpdateTag && !this.needUpdateTag(key) ? this.addUpdateBoundTag() : this.addUpdateShapeAndBoundsTag(), 
         this.addUpdatePositionTag(), this.addUpdateLayoutTag(), this.onAttributeUpdate(context)) : this.normalAttrs[key] = value, 
         "background" === key ? this.loadImage(value, !0) : "shadowGraphic" === key && this.setShadowGraphic(value);
@@ -203,6 +207,7 @@ class Graphic extends node_tree_1.Node {
         this._updateTag = enums_1.UpdateTag.INIT, this.valid = this.isValid(), this.onAttributeUpdate(context);
     }
     translate(x, y) {
+        var _a, _b;
         if (0 === x && 0 === y) return this;
         const context = {
             type: enums_1.AttributeUpdateType.TRANSLATE
@@ -212,10 +217,10 @@ class Graphic extends node_tree_1.Node {
         }, this.attribute, tempConstantXYKey, context);
         params && (x = params.x, y = params.y, delete params.x, delete params.y, this._setAttributes(params));
         const attribute = this.attribute, postMatrix = attribute.postMatrix;
-        return postMatrix ? application_1.application.transformUtil.fromMatrix(postMatrix, postMatrix).translate(x, y) : (attribute.x = (attribute.x ?? config_1.DefaultTransform.x) + x, 
-        attribute.y = (attribute.y ?? config_1.DefaultTransform.y) + y), this.addUpdatePositionTag(), 
-        this.addUpdateBoundTag(), this.addUpdateLayoutTag(), this.onAttributeUpdate(context), 
-        this;
+        return postMatrix ? application_1.application.transformUtil.fromMatrix(postMatrix, postMatrix).translate(x, y) : (attribute.x = (null !== (_a = attribute.x) && void 0 !== _a ? _a : config_1.DefaultTransform.x) + x, 
+        attribute.y = (null !== (_b = attribute.y) && void 0 !== _b ? _b : config_1.DefaultTransform.y) + y), 
+        this.addUpdatePositionTag(), this.addUpdateBoundTag(), this.addUpdateLayoutTag(), 
+        this.onAttributeUpdate(context), this;
     }
     translateTo(x, y) {
         const attribute = this.attribute;
@@ -231,6 +236,7 @@ class Graphic extends node_tree_1.Node {
         this.onAttributeUpdate(context), this);
     }
     scale(scaleX, scaleY, scaleCenter) {
+        var _a, _b;
         if (1 === scaleX && 1 === scaleY) return this;
         const context = {
             type: enums_1.AttributeUpdateType.SCALE
@@ -246,8 +252,8 @@ class Graphic extends node_tree_1.Node {
             let {postMatrix: postMatrix} = this.attribute;
             postMatrix || (postMatrix = new vutils_1.Matrix, attribute.postMatrix = postMatrix), 
             application_1.application.transformUtil.fromMatrix(postMatrix, postMatrix).scale(scaleX, scaleY, scaleCenter);
-        } else attribute.scaleX = (attribute.scaleX ?? config_1.DefaultTransform.scaleX) * scaleX, 
-        attribute.scaleY = (attribute.scaleY ?? config_1.DefaultTransform.scaleY) * scaleY;
+        } else attribute.scaleX = (null !== (_a = attribute.scaleX) && void 0 !== _a ? _a : config_1.DefaultTransform.scaleX) * scaleX, 
+        attribute.scaleY = (null !== (_b = attribute.scaleY) && void 0 !== _b ? _b : config_1.DefaultTransform.scaleY) * scaleY;
         return this.addUpdatePositionTag(), this.addUpdateBoundTag(), this.addUpdateLayoutTag(), 
         this.onAttributeUpdate(context), this;
     }
@@ -265,6 +271,7 @@ class Graphic extends node_tree_1.Node {
         this.addUpdateLayoutTag(), this.onAttributeUpdate(context), this);
     }
     rotate(angle, rotateCenter) {
+        var _a;
         if (0 === angle) return this;
         const context = {
             type: enums_1.AttributeUpdateType.ROTATE
@@ -278,7 +285,7 @@ class Graphic extends node_tree_1.Node {
             let {postMatrix: postMatrix} = this.attribute;
             postMatrix || (postMatrix = new vutils_1.Matrix, attribute.postMatrix = postMatrix), 
             application_1.application.transformUtil.fromMatrix(postMatrix, postMatrix).rotate(angle, rotateCenter);
-        } else attribute.angle = (attribute.angle ?? config_1.DefaultTransform.angle) + angle;
+        } else attribute.angle = (null !== (_a = attribute.angle) && void 0 !== _a ? _a : config_1.DefaultTransform.angle) + angle;
         return this.addUpdatePositionTag(), this.addUpdateBoundTag(), this.addUpdateLayoutTag(), 
         this.onAttributeUpdate(context), this;
     }
@@ -297,7 +304,7 @@ class Graphic extends node_tree_1.Node {
     }
     animate(params) {
         this.animates || (this.animates = new Map);
-        const animate = new animate_1.Animate(params?.id, this.stage && this.stage.getTimeline()).bind(this);
+        const animate = new animate_1.Animate(null == params ? void 0 : params.id, this.stage && this.stage.getTimeline()).bind(this);
         if (params) {
             const {onStart: onStart, onFrame: onFrame, onEnd: onEnd, onRemove: onRemove} = params;
             null != onStart && animate.onStart(onStart), null != onFrame && animate.onFrame(onFrame), 
@@ -321,9 +328,11 @@ class Graphic extends node_tree_1.Node {
         return !(!this.currentStates || !this.currentStates.length) && (!!(0, vutils_1.isNil)(stateName) || this.currentStates.includes(stateName));
     }
     getState(stateName) {
-        return this.states?.[stateName];
+        var _a;
+        return null === (_a = this.states) || void 0 === _a ? void 0 : _a[stateName];
     }
     applyStateAttrs(attrs, stateNames, hasAnimation, isClear) {
+        var _a, _b, _c, _d;
         if (hasAnimation) {
             const keys = Object.keys(attrs), noWorkAttrs = this.getNoWorkAnimateAttr(), animateAttrs = {};
             let noAnimateAttrs;
@@ -331,11 +340,11 @@ class Graphic extends node_tree_1.Node {
                 noWorkAttrs[key] ? (noAnimateAttrs || (noAnimateAttrs = {}), noAnimateAttrs[key] = attrs[key]) : animateAttrs[key] = isClear && void 0 === attrs[key] ? this.getDefaultAttribute(key) : attrs[key];
             }));
             const animate = this.animate();
-            animate.stateNames = stateNames, animate.to(animateAttrs, this.stateAnimateConfig?.duration ?? animate_1.DefaultStateAnimateConfig.duration, this.stateAnimateConfig?.easing ?? animate_1.DefaultStateAnimateConfig.easing), 
+            animate.stateNames = stateNames, animate.to(animateAttrs, null !== (_b = null === (_a = this.stateAnimateConfig) || void 0 === _a ? void 0 : _a.duration) && void 0 !== _b ? _b : animate_1.DefaultStateAnimateConfig.duration, null !== (_d = null === (_c = this.stateAnimateConfig) || void 0 === _c ? void 0 : _c.easing) && void 0 !== _d ? _d : animate_1.DefaultStateAnimateConfig.easing), 
             noAnimateAttrs && this.setAttributes(noAnimateAttrs, !1, {
                 type: enums_1.AttributeUpdateType.STATE
             });
-        } else this.stopStateAnimates(), this.setAttributes(attrs, !1, {
+        } else this.setAttributes(attrs, !1, {
             type: enums_1.AttributeUpdateType.STATE
         });
     }
@@ -351,7 +360,7 @@ class Graphic extends node_tree_1.Node {
     }
     stopStateAnimates(type = "end") {
         this.animates && this.animates.forEach((animate => {
-            animate.stateNames && animate.stop(type);
+            animate.stateNames && (animate.stop(type), this.animates.delete(animate.id));
         }));
     }
     getNormalAttribute(key) {
@@ -364,7 +373,8 @@ class Graphic extends node_tree_1.Node {
         })), value;
     }
     clearStates(hasAnimation) {
-        this.hasState() && this.normalAttrs ? (this.currentStates = [], this.applyStateAttrs(this.normalAttrs, this.currentStates, hasAnimation, !0)) : this.currentStates = [], 
+        this.stopStateAnimates(), this.hasState() && this.normalAttrs ? (this.currentStates = [], 
+        this.applyStateAttrs(this.normalAttrs, this.currentStates, hasAnimation, !0)) : this.currentStates = [], 
         this.normalAttrs = null;
     }
     removeState(stateName, hasAnimation) {
@@ -382,16 +392,20 @@ class Graphic extends node_tree_1.Node {
         }
     }
     addState(stateName, keepCurrentStates, hasAnimation) {
+        var _a;
         if (this.currentStates && this.currentStates.includes(stateName) && (keepCurrentStates || 1 === this.currentStates.length)) return;
-        const newStates = keepCurrentStates && this.currentStates?.length ? this.currentStates.concat([ stateName ]) : [ stateName ];
+        const newStates = keepCurrentStates && (null === (_a = this.currentStates) || void 0 === _a ? void 0 : _a.length) ? this.currentStates.concat([ stateName ]) : [ stateName ];
         this.useStates(newStates, hasAnimation);
     }
     useStates(states, hasAnimation) {
+        var _a;
         if (!states.length) return void this.clearStates(hasAnimation);
-        if (!(this.currentStates?.length !== states.length || states.some(((stateName, index) => this.currentStates[index] !== stateName)))) return;
+        if (!((null === (_a = this.currentStates) || void 0 === _a ? void 0 : _a.length) !== states.length || states.some(((stateName, index) => this.currentStates[index] !== stateName)))) return;
+        this.stopStateAnimates();
         const stateAttrs = {};
         states.forEach((stateName => {
-            const attrs = this.stateProxy ? this.stateProxy(stateName, states) : this.states?.[stateName];
+            var _a;
+            const attrs = this.stateProxy ? this.stateProxy(stateName, states) : null === (_a = this.states) || void 0 === _a ? void 0 : _a[stateName];
             attrs && Object.assign(stateAttrs, attrs);
         })), this.updateNormalAttrs(stateAttrs), this.currentStates = states, this.applyStateAttrs(stateAttrs, states, hasAnimation);
     }
@@ -524,8 +538,9 @@ class Graphic extends node_tree_1.Node {
         propKeys || (propKeys = Object.keys(nextProps), step.propKeys = propKeys), end ? step.propKeys.forEach((key => {
             animate.validAttr(key) && (nextAttributes[key] = nextProps[key]);
         })) : propKeys.forEach((key => {
+            var _a;
             if (!animate.validAttr(key)) return;
-            const nextStepVal = nextProps[key], lastStepVal = (lastProps && lastProps[key]) ?? subAnimate.getLastPropByName(key, step);
+            const nextStepVal = nextProps[key], lastStepVal = null !== (_a = lastProps && lastProps[key]) && void 0 !== _a ? _a : subAnimate.getLastPropByName(key, step);
             if (null == nextStepVal || null == lastStepVal) return void (nextAttributes[key] = nextStepVal);
             let match;
             match = animate.interpolateFunc && animate.interpolateFunc(key, ratio, lastStepVal, nextStepVal, nextAttributes), 
@@ -538,21 +553,21 @@ class Graphic extends node_tree_1.Node {
         !0;
         if ("fill" === key) {
             nextParsedProps || (nextParsedProps = {});
-            const fillColorArray = nextParsedProps.fillColorArray, color = (0, interpolate_1.interpolateColor)(lastStepVal, fillColorArray ?? nextStepVal, ratio, !1, ((fArray, tArray) => {
+            const fillColorArray = nextParsedProps.fillColorArray, color = (0, interpolate_1.interpolateColor)(lastStepVal, null != fillColorArray ? fillColorArray : nextStepVal, ratio, !1, ((fArray, tArray) => {
                 nextParsedProps.fillColorArray = tArray;
             }));
             return color && (nextAttributes[key] = color), !0;
         }
         if ("stroke" === key) {
             nextParsedProps || (nextParsedProps = {});
-            const strokeColorArray = nextParsedProps.strokeColorArray, color = (0, interpolate_1.interpolateColor)(lastStepVal, strokeColorArray ?? nextStepVal, ratio, !1, ((fArray, tArray) => {
+            const strokeColorArray = nextParsedProps.strokeColorArray, color = (0, interpolate_1.interpolateColor)(lastStepVal, null != strokeColorArray ? strokeColorArray : nextStepVal, ratio, !1, ((fArray, tArray) => {
                 nextParsedProps.strokeColorArray = tArray;
             }));
             return color && (nextAttributes[key] = color), !0;
         }
         if ("shadowColor" === key) {
             nextParsedProps || (nextParsedProps = {});
-            const shadowColorArray = nextParsedProps.shadowColorArray, color = (0, interpolate_1.interpolateColor)(lastStepVal, shadowColorArray ?? nextStepVal, ratio, !0, ((fArray, tArray) => {
+            const shadowColorArray = nextParsedProps.shadowColorArray, color = (0, interpolate_1.interpolateColor)(lastStepVal, null != shadowColorArray ? shadowColorArray : nextStepVal, ratio, !0, ((fArray, tArray) => {
                 nextParsedProps.shadowColorArray = tArray;
             }));
             return color && (nextAttributes[key] = color), !0;
@@ -564,13 +579,14 @@ class Graphic extends node_tree_1.Node {
         return (0, theme_1.getTheme)(this)[this.type][name];
     }
     getComputedAttribute(name) {
-        return this.attribute[name] ?? this.getDefaultAttribute(name);
+        var _a;
+        return null !== (_a = this.attribute[name]) && void 0 !== _a ? _a : this.getDefaultAttribute(name);
     }
     onSetStage(cb, immediate = !1) {
         this._onSetStage = cb, immediate && this.stage && cb(this, this.stage);
     }
     attachShadow(shadowRoot) {
-        return shadowRoot && (shadowRoot.shadowHost = this), this.shadowRoot = shadowRoot ?? application_1.application.graphicService.creator.shadowRoot(this), 
+        return shadowRoot && (shadowRoot.shadowHost = this), this.shadowRoot = null != shadowRoot ? shadowRoot : application_1.application.graphicService.creator.shadowRoot(this), 
         this.addUpdateBoundTag(), this.shadowRoot.setStage(this.stage, this.layer), this.shadowRoot;
     }
     detachShadow() {
@@ -634,9 +650,10 @@ class Graphic extends node_tree_1.Node {
         this.releaseStatus = "released", application_1.application.graphicService.onRelease(this);
     }
     _emitCustomEvent(type, context) {
+        var _a, _b;
         if (this._events && type in this._events) {
             const changeEvent = new event_1.CustomEvent(type, context);
-            changeEvent.bubbles = !1, changeEvent.manager = this.stage?.eventSystem?.manager, 
+            changeEvent.bubbles = !1, changeEvent.manager = null === (_b = null === (_a = this.stage) || void 0 === _a ? void 0 : _a.eventSystem) || void 0 === _b ? void 0 : _b.manager, 
             this.dispatchEvent(changeEvent);
         }
     }