@visactor/vrender-core 1.1.6-alpha.0 → 1.1.6

package/cjs/graphic/graphic.js

@@ -144,8 +144,9 @@ class GraphicImpl extends node_tree_1.Node {
         }
         return null === (_a = this.stage) || void 0 === _a ? void 0 : _a.rootSharedStateScope;
     }
-    syncSharedStateScopeBinding(nextScope, markDirty = !0) {
+    syncSharedStateScopeBindingFromTree(markDirty = !0) {
         var _a;
+        const nextScope = this.resolveBoundSharedStateScope();
         return this.boundSharedStateScope === nextScope ? (this.syncSharedStateActiveRegistrations(), 
         !1) : (this.boundSharedStateScope = nextScope, this.boundSharedStateRevision = void 0, 
         this.compiledStateDefinitions = void 0, this.compiledStateDefinitionsCacheKey = void 0, 
@@ -153,13 +154,9 @@ class GraphicImpl extends node_tree_1.Node {
         markDirty && (null === (_a = this.currentStates) || void 0 === _a ? void 0 : _a.length) && this.markSharedStateDirty(), 
         !0);
     }
-    syncSharedStateScopeBindingFromTree(markDirty = !0, inheritedSharedStateScope) {
-        const nextScope = void 0 === inheritedSharedStateScope ? this.resolveBoundSharedStateScope() : null != inheritedSharedStateScope ? inheritedSharedStateScope : void 0;
-        return this.syncSharedStateScopeBinding(nextScope, markDirty);
-    }
-    syncSharedStateScopeBindingOnTreeChange(markDirty = !0, inheritedSharedStateScope) {
+    syncSharedStateScopeBindingOnTreeChange(markDirty = !0) {
         var _a, _b;
-        return !!((null === (_a = this.currentStates) || void 0 === _a ? void 0 : _a.length) || this.boundSharedStateScope || (null === (_b = this.registeredActiveScopes) || void 0 === _b ? void 0 : _b.size) || this.sharedStateDirty) && this.syncSharedStateScopeBindingFromTree(markDirty, inheritedSharedStateScope);
+        return !!((null === (_a = this.currentStates) || void 0 === _a ? void 0 : _a.length) || this.boundSharedStateScope || (null === (_b = this.registeredActiveScopes) || void 0 === _b ? void 0 : _b.size) || this.sharedStateDirty) && this.syncSharedStateScopeBindingFromTree(markDirty);
     }
     syncSharedStateActiveRegistrations() {
         var _a;
@@ -167,7 +164,6 @@ class GraphicImpl extends node_tree_1.Node {
         if (!(null === (_a = this.currentStates) || void 0 === _a ? void 0 : _a.length) || !this.boundSharedStateScope) return (null == previousScopes ? void 0 : previousScopes.size) && (previousScopes.forEach((scope => {
             scope.subtreeActiveDescendants.delete(this);
         })), previousScopes.clear()), void (this.registeredActiveScopes = void 0);
-        if ((null == previousScopes ? void 0 : previousScopes.size) && this.isSharedStateScopeChainRegistered(previousScopes)) return;
         const nextScopes = new Set((0, shared_state_scope_1.collectSharedStateScopeChain)(this.boundSharedStateScope));
         null == previousScopes || previousScopes.forEach((scope => {
             nextScopes.has(scope) || scope.subtreeActiveDescendants.delete(this);
@@ -175,14 +171,6 @@ class GraphicImpl extends node_tree_1.Node {
             scope.subtreeActiveDescendants.add(this);
         })), this.registeredActiveScopes = nextScopes;
     }
-    isSharedStateScopeChainRegistered(previousScopes) {
-        let scope = this.boundSharedStateScope, scopeCount = 0;
-        for (;scope; ) {
-            if (!previousScopes.has(scope)) return !1;
-            scopeCount += 1, scope = scope.parentScope;
-        }
-        return scopeCount === previousScopes.size;
-    }
     clearSharedStateActiveRegistrations() {
         const previousScopes = this.registeredActiveScopes;
         previousScopes && (previousScopes.forEach((scope => {
@@ -193,8 +181,8 @@ class GraphicImpl extends node_tree_1.Node {
         this.sharedStateDirty = !0, (0, shared_state_refresh_1.enqueueGraphicSharedStateRefresh)(this.stage, this), 
         (0, shared_state_refresh_1.scheduleStageSharedStateRefresh)(this.stage);
     }
-    onParentSharedStateTreeChanged(stage, layer, inheritedSharedStateScope) {
-        this.stage === stage && this.layer === layer ? this.syncSharedStateScopeBindingOnTreeChange(!0, inheritedSharedStateScope) : this.setStage(stage, layer, inheritedSharedStateScope);
+    onParentSharedStateTreeChanged(stage, layer) {
+        this.stage === stage && this.layer === layer ? this.syncSharedStateScopeBindingOnTreeChange() : this.setStage(stage, layer);
     }
     refreshSharedStateBeforeRender() {
         var _a;
@@ -247,20 +235,19 @@ class GraphicImpl extends node_tree_1.Node {
         })), snapshot) : snapshot;
     }
     buildRemovedStateAnimationAttrs(targetStateAttrs, previousResolvedStatePatch) {
-        const extraAttrs = {};
-        if (!previousResolvedStatePatch) return extraAttrs;
-        const snapshot = this.buildStaticAttributeSnapshot(), staticTargetAttrs = snapshot;
+        if (!previousResolvedStatePatch) return;
+        const snapshot = this.buildStaticAttributeSnapshot(), extraAttrs = {};
         return Object.keys(previousResolvedStatePatch).forEach((key => {
             const hasTargetAttr = Object.prototype.hasOwnProperty.call(targetStateAttrs, key);
             if (hasTargetAttr && void 0 !== targetStateAttrs[key]) return;
             const assignFallbackAttr = value => {
-                void 0 === value && this.shouldSkipStateTransitionDefaultAttribute(key, staticTargetAttrs) || (extraAttrs[key] = void 0 === value ? value : cloneAttributeValue(value));
+                extraAttrs[key] = void 0 === value ? value : cloneAttributeValue(value);
             };
-            if (hasTargetAttr) assignFallbackAttr(this.getStateTransitionDefaultAttribute(key, staticTargetAttrs)); else if (Object.prototype.hasOwnProperty.call(snapshot, key)) {
-                const snapshotValue = snapshot[key];
-                assignFallbackAttr(void 0 === snapshotValue ? this.getStateTransitionDefaultAttribute(key, staticTargetAttrs) : snapshotValue);
-            } else assignFallbackAttr(this.getStateTransitionDefaultAttribute(key, staticTargetAttrs));
-        })), extraAttrs;
+            hasTargetAttr ? assignFallbackAttr(targetStateAttrs[key]) : Object.prototype.hasOwnProperty.call(snapshot, key) ? assignFallbackAttr(snapshot[key]) : assignFallbackAttr(void 0);
+        })), {
+            extraAttrs: extraAttrs,
+            stateTransitionTargetAttrs: snapshot
+        };
     }
     syncObjectToSnapshot(target, snapshot, excludedKeys) {
         const delta = new Map;
@@ -844,12 +831,6 @@ class GraphicImpl extends node_tree_1.Node {
         var _a;
         return null === (_a = this.states) || void 0 === _a ? void 0 : _a[stateName];
     }
-    setStateDefinitionsWithCompiled(definitions, compiledDefinitions) {
-        var _a;
-        this.states = definitions, this.localStateDefinitionsSource !== definitions && (this.localStateDefinitionsSource = definitions, 
-        this.localStateDefinitionsVersion = (null !== (_a = this.localStateDefinitionsVersion) && void 0 !== _a ? _a : 0) + 1), 
-        this.compiledStateDefinitions = compiledDefinitions, this.compiledStateDefinitionsCacheKey = `local:${this.localStateDefinitionsVersion}`;
-    }
     getStateResolveBaseAttrs() {
         var _a;
         return null !== (_a = this.baseAttributes) && void 0 !== _a ? _a : this.attribute;
@@ -967,32 +948,38 @@ class GraphicImpl extends node_tree_1.Node {
     commitSameStatePatchRefresh(states, hasAnimation, animateSameStatePatchChange = !1) {
         var _a;
         const previousStates = null !== (_a = this.currentStates) && void 0 !== _a ? _a : EMPTY_STATE_NAMES, previousResolvedStatePatch = this.resolvedStatePatch, {transition: transition, effectiveStates: effectiveStates, resolvedStateAttrs: resolvedStateAttrs} = this.resolveGraphicStateTransition(states, !0), patchChanged = !this.sameStatePatches(previousResolvedStatePatch, resolvedStateAttrs);
-        patchChanged && !this.beforeStateUpdate(resolvedStateAttrs, previousStates, transition.states, hasAnimation, !1) || (this.currentStates = transition.states, 
+        if ((!patchChanged || this.beforeStateUpdate(resolvedStateAttrs, previousStates, transition.states, hasAnimation, !1)) && (this.currentStates = transition.states, 
         this.effectiveStates = [ ...effectiveStates ], this.resolvedStatePatch = resolvedStateAttrs, 
-        this.sharedStateDirty = !1, this.syncSharedStateActiveRegistrations(), patchChanged && (hasAnimation && animateSameStatePatchChange ? (this._syncFinalAttributeFromStaticTruth(), 
-        this.applyStateAttrs(resolvedStateAttrs, transition.states, hasAnimation, !1, void 0, this.buildRemovedStateAnimationAttrs(resolvedStateAttrs, previousResolvedStatePatch))) : (this.stopStateAnimates(), 
-        this.attributeMayContainTransientAttrs ? this._restoreAttributeFromStaticTruth({
+        this.sharedStateDirty = !1, this.syncSharedStateActiveRegistrations(), patchChanged)) if (hasAnimation && animateSameStatePatchChange) {
+            this._syncFinalAttributeFromStaticTruth();
+            const removedStateAnimationAttrs = this.buildRemovedStateAnimationAttrs(resolvedStateAttrs, previousResolvedStatePatch);
+            this.applyStateAttrs(resolvedStateAttrs, transition.states, hasAnimation, !1, void 0, null == removedStateAnimationAttrs ? void 0 : removedStateAnimationAttrs.extraAttrs, null == removedStateAnimationAttrs ? void 0 : removedStateAnimationAttrs.stateTransitionTargetAttrs);
+        } else this.stopStateAnimates(), this.attributeMayContainTransientAttrs ? this._restoreAttributeFromStaticTruth({
             type: enums_1.AttributeUpdateType.STATE
         }) : this.restoreAttributeFromStatePatchDelta(previousResolvedStatePatch, this.resolvedStatePatch, {
             type: enums_1.AttributeUpdateType.STATE
-        }), this.emitStateUpdateEvent())));
+        }), this.emitStateUpdateEvent();
     }
     resolveStateAnimateConfig(animateConfig) {
         var _a, _b, _c;
         return null !== (_c = null !== (_a = null != animateConfig ? animateConfig : this.stateAnimateConfig) && void 0 !== _a ? _a : null === (_b = this.context) || void 0 === _b ? void 0 : _b.stateAnimateConfig) && void 0 !== _c ? _c : config_2.DefaultStateAnimateConfig;
     }
-    applyStateAttrs(attrs, stateNames, hasAnimation, isClear, animateConfig, extraAnimateAttrs) {
+    applyStateAttrs(attrs, stateNames, hasAnimation, isClear, animateConfig, extraAnimateAttrs, stateTransitionTargetAttrs) {
         const resolvedAnimateConfig = hasAnimation ? this.resolveStateAnimateConfig(animateConfig) : void 0, transitionOptions = resolvedAnimateConfig ? {
             animateConfig: resolvedAnimateConfig,
             extraAnimateAttrs: extraAnimateAttrs,
-            shouldSkipDefaultAttribute: this.shouldSkipStateTransitionDefaultAttribute.bind(this)
+            getStateTransitionDefaultAttribute: this.getStateTransitionDefaultAttribute.bind(this),
+            shouldSkipDefaultAttribute: this.shouldSkipStateTransitionDefaultAttribute.bind(this),
+            stateTransitionTargetAttrs: stateTransitionTargetAttrs
         } : void 0;
         if (isClear) return void this.getStateTransitionOrchestrator().applyClearTransition(this, attrs, hasAnimation, transitionOptions);
         const plan = this.getStateTransitionOrchestrator().analyzeTransition(attrs, hasAnimation, {
             noWorkAnimateAttr: this.getNoWorkAnimateAttr(),
             animateConfig: resolvedAnimateConfig,
             extraAnimateAttrs: extraAnimateAttrs,
-            shouldSkipDefaultAttribute: this.shouldSkipStateTransitionDefaultAttribute.bind(this)
+            getStateTransitionDefaultAttribute: this.getStateTransitionDefaultAttribute.bind(this),
+            shouldSkipDefaultAttribute: this.shouldSkipStateTransitionDefaultAttribute.bind(this),
+            stateTransitionTargetAttrs: stateTransitionTargetAttrs
         });
         this.getStateTransitionOrchestrator().applyTransition(this, plan, hasAnimation, transitionOptions);
     }
@@ -1019,15 +1006,17 @@ class GraphicImpl extends node_tree_1.Node {
         this.effectiveStates = [], this.resolvedStatePatch = void 0, this.sharedStateDirty = !1, 
         void this.clearSharedStateActiveRegistrations();
         const resolvedStateAttrs = hasAnimation || this.hasCustomEvent("beforeStateUpdate") ? cloneAttributeValue(null !== (_b = this.baseAttributes) && void 0 !== _b ? _b : {}) : null !== (_c = this.baseAttributes) && void 0 !== _c ? _c : {};
-        transition.changed && !this.beforeStateUpdate(resolvedStateAttrs, previousStates, transition.states, hasAnimation, !0) || (this.currentStates = transition.states, 
+        if (!transition.changed || this.beforeStateUpdate(resolvedStateAttrs, previousStates, transition.states, hasAnimation, !0)) if (this.currentStates = transition.states, 
         this.effectiveStates = [], this.resolvedStatePatch = void 0, this.sharedStateDirty = !1, 
-        this.clearSharedStateActiveRegistrations(), hasAnimation ? (this._syncFinalAttributeFromStaticTruth(), 
-        this.applyStateAttrs(resolvedStateAttrs, transition.states, hasAnimation, !0, void 0, this.buildRemovedStateAnimationAttrs(resolvedStateAttrs, previousResolvedStatePatch))) : (this.stopStateAnimates(), 
-        this.attributeMayContainTransientAttrs ? this._restoreAttributeFromStaticTruth({
+        this.clearSharedStateActiveRegistrations(), hasAnimation) {
+            this._syncFinalAttributeFromStaticTruth();
+            const removedStateAnimationAttrs = this.buildRemovedStateAnimationAttrs(resolvedStateAttrs, previousResolvedStatePatch);
+            this.applyStateAttrs(resolvedStateAttrs, transition.states, hasAnimation, !0, void 0, null == removedStateAnimationAttrs ? void 0 : removedStateAnimationAttrs.extraAttrs, null == removedStateAnimationAttrs ? void 0 : removedStateAnimationAttrs.stateTransitionTargetAttrs);
+        } else this.stopStateAnimates(), this.attributeMayContainTransientAttrs ? this._restoreAttributeFromStaticTruth({
             type: enums_1.AttributeUpdateType.STATE
         }) : this.restoreAttributeFromStatePatchDelta(previousResolvedStatePatch, void 0, {
             type: enums_1.AttributeUpdateType.STATE
-        }), this.emitStateUpdateEvent()));
+        }), this.emitStateUpdateEvent();
     }
     removeState(stateName, hasAnimation) {
         const transition = this.resolveRemoveStateTransition(stateName);
@@ -1056,15 +1045,17 @@ class GraphicImpl extends node_tree_1.Node {
         var _a;
         if (!states.length) return void this.clearStates(hasAnimation);
         const previousStates = null !== (_a = this.currentStates) && void 0 !== _a ? _a : EMPTY_STATE_NAMES, previousResolvedStatePatch = this.resolvedStatePatch, {transition: transition, effectiveStates: effectiveStates, resolvedStateAttrs: resolvedStateAttrs} = this.resolveGraphicStateTransition(states);
-        !transition.changed && this.sameStateNames(previousStates, transition.states) || this.beforeStateUpdate(resolvedStateAttrs, previousStates, transition.states, hasAnimation, !1) && (this.currentStates = transition.states, 
+        if ((transition.changed || !this.sameStateNames(previousStates, transition.states)) && this.beforeStateUpdate(resolvedStateAttrs, previousStates, transition.states, hasAnimation, !1)) if (this.currentStates = transition.states, 
         this.effectiveStates = [ ...effectiveStates ], this.resolvedStatePatch = resolvedStateAttrs, 
-        this.sharedStateDirty = !1, this.syncSharedStateActiveRegistrations(), hasAnimation ? (this._syncFinalAttributeFromStaticTruth(), 
-        this.applyStateAttrs(resolvedStateAttrs, transition.states, hasAnimation, !1, void 0, this.buildRemovedStateAnimationAttrs(resolvedStateAttrs, previousResolvedStatePatch))) : (this.stopStateAnimates(), 
-        this.attributeMayContainTransientAttrs ? this._restoreAttributeFromStaticTruth({
+        this.sharedStateDirty = !1, this.syncSharedStateActiveRegistrations(), hasAnimation) {
+            this._syncFinalAttributeFromStaticTruth();
+            const removedStateAnimationAttrs = this.buildRemovedStateAnimationAttrs(resolvedStateAttrs, previousResolvedStatePatch);
+            this.applyStateAttrs(resolvedStateAttrs, transition.states, hasAnimation, !1, void 0, null == removedStateAnimationAttrs ? void 0 : removedStateAnimationAttrs.extraAttrs, null == removedStateAnimationAttrs ? void 0 : removedStateAnimationAttrs.stateTransitionTargetAttrs);
+        } else this.stopStateAnimates(), this.attributeMayContainTransientAttrs ? this._restoreAttributeFromStaticTruth({
             type: enums_1.AttributeUpdateType.STATE
         }) : this.restoreAttributeFromStatePatchDelta(previousResolvedStatePatch, this.resolvedStatePatch, {
             type: enums_1.AttributeUpdateType.STATE
-        }), this.emitStateUpdateEvent()));
+        }), this.emitStateUpdateEvent();
     }
     invalidateResolver() {
         var _a, _b;
@@ -1175,11 +1166,11 @@ class GraphicImpl extends node_tree_1.Node {
             this._globalTransMatrix.translate(scrollX, scrollY);
         }
     }
-    setStage(stage, layer, inheritedSharedStateScope) {
+    setStage(stage, layer) {
         var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
         const graphicService = null !== (_c = null !== (_a = null == stage ? void 0 : stage.graphicService) && void 0 !== _a ? _a : null === (_b = this.stage) || void 0 === _b ? void 0 : _b.graphicService) && void 0 !== _c ? _c : application_1.application.graphicService, previousStage = this.stage;
         if (this.stage !== stage || this.layer !== layer) {
-            if (this.stage = stage, this.layer = layer, ((null === (_d = this.currentStates) || void 0 === _d ? void 0 : _d.length) || this.boundSharedStateScope || (null === (_e = this.registeredActiveScopes) || void 0 === _e ? void 0 : _e.size) || this.sharedStateDirty) && this.syncSharedStateScopeBindingOnTreeChange(!0, inheritedSharedStateScope), 
+            if (this.stage = stage, this.layer = layer, ((null === (_d = this.currentStates) || void 0 === _d ? void 0 : _d.length) || this.boundSharedStateScope || (null === (_e = this.registeredActiveScopes) || void 0 === _e ? void 0 : _e.size) || this.sharedStateDirty) && this.syncSharedStateScopeBindingOnTreeChange(!0), 
             this.setStageToShadowRoot(stage, layer), this.mayHaveTrackedAnimates() && this.hasAnyTrackedAnimate()) {
                 const previousTimeline = null === (_f = null == previousStage ? void 0 : previousStage.getTimeline) || void 0 === _f ? void 0 : _f.call(previousStage), nextTimeline = null === (_g = null == stage ? void 0 : stage.getTimeline) || void 0 === _g ? void 0 : _g.call(stage), detachedStageAnimates = [];
                 this.visitTrackedAnimates((a => {
@@ -1197,7 +1188,7 @@ class GraphicImpl extends node_tree_1.Node {
             }
             return this._onSetStage && this._onSetStage(this, stage, layer), void (null === (_h = null == graphicService ? void 0 : graphicService.onSetStage) || void 0 === _h || _h.call(graphicService, this, stage));
         }
-        ((null === (_j = this.currentStates) || void 0 === _j ? void 0 : _j.length) || this.boundSharedStateScope || (null === (_k = this.registeredActiveScopes) || void 0 === _k ? void 0 : _k.size) || this.sharedStateDirty) && this.syncSharedStateScopeBindingOnTreeChange(!0, inheritedSharedStateScope);
+        ((null === (_j = this.currentStates) || void 0 === _j ? void 0 : _j.length) || this.boundSharedStateScope || (null === (_k = this.registeredActiveScopes) || void 0 === _k ? void 0 : _k.size) || this.sharedStateDirty) && this.syncSharedStateScopeBindingOnTreeChange(!0);
     }
     detachStageForRelease() {
         var _a, _b, _c;