@visactor/vrender-kits 1.1.4-alpha.1 → 1.1.4-alpha.2

package/dist/index.es.js

@@ -4496,13 +4496,14 @@ function applyFillStyle(ctx, character, b) {
   }) : fillStyle, setTextStyle(ctx, character);
 }
 function applyStrokeStyle(ctx, character) {
+  var _a, _b;
   const strokeStyle = character && character.stroke || defaultFormatting.stroke;
   if (!strokeStyle) return void (ctx.globalAlpha = 0);
   const {
     strokeOpacity = 1,
     opacity = 1
   } = character;
-  ctx.globalAlpha = strokeOpacity * opacity, ctx.lineWidth = character && "number" == typeof character.lineWidth ? character.lineWidth : 1, ctx.strokeStyle = strokeStyle, setTextStyle(ctx, character);
+  ctx.globalAlpha = strokeOpacity * opacity, ctx.lineWidth = character && "number" == typeof character.lineWidth ? character.lineWidth : 1, ctx.setLineDash(null !== (_a = character.lineDash) && void 0 !== _a ? _a : []), ctx.lineDashOffset = null !== (_b = character.lineDashOffset) && void 0 !== _b ? _b : 0, ctx.strokeStyle = strokeStyle, setTextStyle(ctx, character);
 }
 function getStrByWithCanvas(desc, width, character, guessIndex, needTestLetter) {
   if (desc.length <= 1) return 0;
@@ -6286,7 +6287,7 @@ class Node extends EventEmitter {
   constructor() {
     super(), this._uid = Generator.GenAutoIncrementId(), this._firstChild = null, this._lastChild = null, this.parent = null, this._count = 1;
   }
-  onParentSharedStateTreeChanged(_stage, _layer) {}
+  onParentSharedStateTreeChanged(_stage, _layer, _inheritedSharedStateScope) {}
   forEachChildren(cb, reverse = !1) {
     if (reverse) {
       let child = this._lastChild,
@@ -8208,6 +8209,8 @@ class StateEngine {
     this.graphic === graphic && this.baseAttributes === baseAttributes || this.invalidateResolverCache(), this.graphic = graphic, this.baseAttributes = baseAttributes;
   }
   applyStates(stateNames) {
+    const singleStaticStateResult = this.tryApplySingleStaticState(stateNames);
+    if (singleStaticStateResult) return singleStaticStateResult;
     const uniqueStates = Array.from(new Set(stateNames)),
       sortedStates = this.sortStates(uniqueStates),
       adjudicated = this.adjudicate(sortedStates),
@@ -8222,6 +8225,19 @@ class StateEngine {
       suppressed: [...this._suppressed]
     };
   }
+  tryApplySingleStaticState(stateNames) {
+    if (1 !== stateNames.length || "shallow" !== this.mergeMode) return;
+    const stateName = stateNames[0],
+      definition = this.compiledDefinitions.get(stateName);
+    if (definition && (definition.hasResolver || definition.exclude.size || definition.suppress.size)) return;
+    const changed = 1 !== this._activeStates.length || this._activeStates[0] !== stateName || 1 !== this._effectiveStates.length || this._effectiveStates[0] !== stateName || 0 !== this._suppressed.length;
+    return this._activeStates = [stateName], this._effectiveStates = [stateName], this._suppressed = [], !changed && this.resolverCacheValid || (this.resolverPatchCache.clear(), this.resolverCacheKey = stateName, this.resolverCacheValid = !0, this._resolvedPatch = (null == definition ? void 0 : definition.patch) ? cloneValue(definition.patch) : {}), {
+      changed: changed,
+      activeStates: [...this._activeStates],
+      effectiveStates: [...this._effectiveStates],
+      suppressed: []
+    };
+  }
   addState(stateName, keepCurrentStates) {
     if (this._activeStates.includes(stateName) && (keepCurrentStates || 1 === this._activeStates.length)) return {
       changed: !1,
@@ -8634,14 +8650,17 @@ class GraphicImpl extends Node {
     }
     return null === (_a = this.stage) || void 0 === _a ? void 0 : _a.rootSharedStateScope;
   }
-  syncSharedStateScopeBindingFromTree(markDirty = !0) {
+  syncSharedStateScopeBinding(nextScope, 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, this.stateEngine = void 0, this.stateEngineCompiledDefinitions = void 0, this.syncSharedStateActiveRegistrations(), markDirty && (null === (_a = this.currentStates) || void 0 === _a ? void 0 : _a.length) && this.markSharedStateDirty(), !0);
   }
-  syncSharedStateScopeBindingOnTreeChange(markDirty = !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) {
     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);
+    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);
   }
   syncSharedStateActiveRegistrations() {
     var _a;
@@ -8649,6 +8668,7 @@ class GraphicImpl extends 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(collectSharedStateScopeChain(this.boundSharedStateScope));
     null == previousScopes || previousScopes.forEach(scope => {
       nextScopes.has(scope) || scope.subtreeActiveDescendants.delete(this);
@@ -8656,6 +8676,15 @@ class GraphicImpl extends 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 => {
@@ -8665,8 +8694,8 @@ class GraphicImpl extends Node {
   markSharedStateDirty() {
     this.sharedStateDirty = !0, enqueueGraphicSharedStateRefresh(this.stage, this), scheduleStageSharedStateRefresh(this.stage);
   }
-  onParentSharedStateTreeChanged(stage, layer) {
-    this.stage === stage && this.layer === layer ? this.syncSharedStateScopeBindingOnTreeChange() : this.setStage(stage, layer);
+  onParentSharedStateTreeChanged(stage, layer, inheritedSharedStateScope) {
+    this.stage === stage && this.layer === layer ? this.syncSharedStateScopeBindingOnTreeChange(!0, inheritedSharedStateScope) : this.setStage(stage, layer, inheritedSharedStateScope);
   }
   refreshSharedStateBeforeRender() {
     var _a;
@@ -9317,6 +9346,10 @@ class GraphicImpl extends 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;
@@ -9510,8 +9543,10 @@ class GraphicImpl extends Node {
     transition.changed && this.useStates(transition.states, hasAnimation);
   }
   addState(stateName, keepCurrentStates, hasAnimation) {
-    const transition = this.resolveAddStateTransition(stateName, keepCurrentStates);
-    transition.changed && this.useStates(transition.states, hasAnimation);
+    const currentStates = this.currentStates;
+    if ((null == currentStates ? void 0 : currentStates.includes(stateName)) && (keepCurrentStates || 1 === currentStates.length)) return;
+    const nextStates = keepCurrentStates && (null == currentStates ? void 0 : currentStates.length) ? currentStates.concat([stateName]) : [stateName];
+    this.useStates(nextStates, hasAnimation);
   }
   setStates(states, options) {
     var _a, _b, _c;
@@ -9664,12 +9699,12 @@ class GraphicImpl extends Node {
       this._globalTransMatrix.translate(scrollX, scrollY);
     }
   }
-  setStage(stage, layer) {
+  setStage(stage, layer, inheritedSharedStateScope) {
     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.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), this.setStageToShadowRoot(stage, layer), this.mayHaveTrackedAnimates() && this.hasAnyTrackedAnimate()) {
+      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), 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 = [];
@@ -9686,7 +9721,7 @@ class GraphicImpl extends 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);
+    ((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);
   }
   detachStageForRelease() {
     var _a, _b, _c;
@@ -10075,17 +10110,17 @@ class Group extends Graphic {
   }
   incrementalAppendChild(node) {
     const data = super.appendChild(node);
-    return data && this.syncChildSharedStateTreeBinding(data), this.addUpdateBoundTag(), this.getGraphicService().onAddIncremental(node, this, this.stage), data;
+    return data && this.shouldSyncChildSharedStateTreeBinding(data) && this.syncChildSharedStateTreeBinding(data), this.addUpdateBoundTag(), this.getGraphicService().onAddIncremental(node, this, this.stage), data;
   }
   incrementalClearChild() {
     super.removeAllChild(), this.addUpdateBoundTag(), this.getGraphicService().onClearIncremental(this, this.stage);
   }
   _updateChildToStage(child) {
-    return child && this.syncChildSharedStateTreeBinding(child), this.addUpdateBoundTag(), child;
+    return child && this.shouldSyncChildSharedStateTreeBinding(child) && this.syncChildSharedStateTreeBinding(child), this.addUpdateBoundTag(), child;
   }
   appendChild(node, addStage = !0) {
     const data = super.appendChild(node);
-    return data && addStage && this.syncChildSharedStateTreeBinding(data), this.addUpdateBoundTag(), data;
+    return data && addStage && this.shouldSyncChildSharedStateTreeBinding(data) && this.syncChildSharedStateTreeBinding(data), this.addUpdateBoundTag(), data;
   }
   insertBefore(newNode, referenceNode) {
     return this._updateChildToStage(super.insertBefore(newNode, referenceNode));
@@ -10108,13 +10143,13 @@ class Group extends Graphic {
       child.setStage(null, null);
     }), this.addUpdateBoundTag();
   }
-  setStage(stage, layer) {
+  setStage(stage, layer, inheritedSharedStateScope) {
     var _a, _b, _c, _d, _e, _f;
     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.graphicService,
       needsSharedStateTreeSync = this.hasSharedStateDefinitions() || this.sharedStateScope || (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;
-    if (this.stage !== stage) return this.stage = stage, this.layer = layer, needsSharedStateTreeSync && (this.ensureSharedStateScopeBound(), this.syncSharedStateScopeBindingOnTreeChange(!0)), this.setStageToShadowRoot(stage, layer), this._onSetStage && this._onSetStage(this, stage, layer), null === (_f = null == graphicService ? void 0 : graphicService.onSetStage) || void 0 === _f || _f.call(graphicService, this, stage), void this.notifyChildrenSharedStateTreeChanged();
+    if (this.stage !== stage) return this.stage = stage, this.layer = layer, needsSharedStateTreeSync && (this.ensureSharedStateScopeBound(), this.syncSharedStateScopeBindingOnTreeChange(!0, inheritedSharedStateScope)), this.setStageToShadowRoot(stage, layer), this._onSetStage && this._onSetStage(this, stage, layer), null === (_f = null == graphicService ? void 0 : graphicService.onSetStage) || void 0 === _f || _f.call(graphicService, this, stage), void this.notifyChildrenSharedStateTreeChanged(inheritedSharedStateScope);
     const layerChanged = this.layer !== layer;
-    layerChanged && (this.layer = layer), needsSharedStateTreeSync ? (this.ensureSharedStateScopeBound(), this.syncSharedStateScopeBindingOnTreeChange(!0), this.notifyChildrenSharedStateTreeChanged()) : layerChanged && this.notifyChildrenSharedStateTreeChanged();
+    layerChanged && (this.layer = layer), needsSharedStateTreeSync ? (this.ensureSharedStateScopeBound(), this.syncSharedStateScopeBindingOnTreeChange(!0, inheritedSharedStateScope), this.notifyChildrenSharedStateTreeChanged(inheritedSharedStateScope)) : layerChanged && this.notifyChildrenSharedStateTreeChanged(inheritedSharedStateScope);
   }
   addUpdatePositionTag() {
     super.addUpdatePositionTag(), this.forEachChildren(g => {
@@ -10173,17 +10208,29 @@ class Group extends Graphic {
   hasSharedStateDefinitions() {
     return !!this._sharedStateDefinitions && Object.keys(this._sharedStateDefinitions).length > 0;
   }
-  notifyChildrenSharedStateTreeChanged() {
+  resolveChildSharedStateScope(inheritedSharedStateScope) {
+    var _a;
+    return this.sharedStateScope ? this.sharedStateScope : void 0 !== inheritedSharedStateScope ? inheritedSharedStateScope : null !== (_a = this.resolveBoundSharedStateScope()) && void 0 !== _a ? _a : null;
+  }
+  notifyChildrenSharedStateTreeChanged(inheritedSharedStateScope) {
+    const childSharedStateScope = this.resolveChildSharedStateScope(inheritedSharedStateScope);
     this.forEachChildren(item => {
-      this.syncChildSharedStateTreeBinding(item);
+      this.setStageToChild(item, childSharedStateScope);
     });
   }
-  syncChildSharedStateTreeBinding(child) {
-    child.onParentSharedStateTreeChanged(this.stage, this.layer);
+  shouldSyncChildSharedStateTreeBinding(child) {
+    return !(!this.stage && !this.layer) || child.onParentSharedStateTreeChanged !== Graphic.prototype.onParentSharedStateTreeChanged && child.onParentSharedStateTreeChanged !== Group.prototype.onParentSharedStateTreeChanged;
+  }
+  setStageToChild(child, inheritedSharedStateScope) {
+    const graphic = child;
+    "function" != typeof graphic.setStage || child.onParentSharedStateTreeChanged !== Graphic.prototype.onParentSharedStateTreeChanged && child.onParentSharedStateTreeChanged !== Group.prototype.onParentSharedStateTreeChanged || graphic.stage === this.stage && graphic.layer === this.layer ? child.onParentSharedStateTreeChanged(this.stage, this.layer, inheritedSharedStateScope) : graphic.setStage(this.stage, this.layer, inheritedSharedStateScope);
   }
-  onParentSharedStateTreeChanged(stage, layer) {
+  syncChildSharedStateTreeBinding(child, inheritedSharedStateScope) {
+    void 0 === inheritedSharedStateScope && (inheritedSharedStateScope = this.resolveChildSharedStateScope()), this.setStageToChild(child, inheritedSharedStateScope);
+  }
+  onParentSharedStateTreeChanged(stage, layer, inheritedSharedStateScope) {
     var _a;
-    this.stage === stage && this.layer === layer ? (this.ensureSharedStateScopeBound(), this.syncSharedStateScopeBindingOnTreeChange(!!(null === (_a = this.currentStates) || void 0 === _a ? void 0 : _a.length)), this.notifyChildrenSharedStateTreeChanged()) : this.setStage(stage, layer);
+    this.stage === stage && this.layer === layer ? (this.ensureSharedStateScopeBound(), this.syncSharedStateScopeBindingOnTreeChange(!!(null === (_a = this.currentStates) || void 0 === _a ? void 0 : _a.length), inheritedSharedStateScope), this.notifyChildrenSharedStateTreeChanged(inheritedSharedStateScope)) : this.setStage(stage, layer, inheritedSharedStateScope);
   }
 }
 Group.NOWORK_ANIMATE_ATTR = NOWORK_ANIMATE_ATTR;
@@ -13557,8 +13604,8 @@ class RichText extends Graphic {
   clone() {
     return new RichText(Object.assign({}, this.attribute));
   }
-  setStage(stage, layer) {
-    super.setStage(stage, layer);
+  setStage(stage, layer, inheritedSharedStateScope) {
+    super.setStage(stage, layer, inheritedSharedStateScope);
     this.getFrameCache().icons.forEach(icon => {
       icon.setStage(stage, layer);
     });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@visactor/vrender-kits",
-  "version": "1.1.4-alpha.1",
+  "version": "1.1.4-alpha.2",
   "description": "",
   "sideEffects": false,
   "main": "cjs/index-node.js",
@@ -44,7 +44,7 @@
   ],
   "dependencies": {
     "@visactor/vutils": "~1.0.12",
-    "@visactor/vrender-core": "1.1.4-alpha.1",
+    "@visactor/vrender-core": "1.1.4-alpha.2",
     "@resvg/resvg-js": "2.4.1",
     "roughjs": "4.6.6",
     "gifuct-js": "2.1.2",
@@ -69,9 +69,9 @@
     "vite": "3.2.6",
     "typescript": "4.9.5",
     "cross-env": "^7.0.3",
-    "@internal/eslint-config": "0.0.1",
+    "@internal/ts-config": "0.0.1",
     "@internal/bundler": "0.0.1",
-    "@internal/ts-config": "0.0.1"
+    "@internal/eslint-config": "0.0.1"
   },
   "keywords": [
     "VisActor",