@visactor/vrender-core 1.1.0-alpha.4 → 1.1.0-alpha.6

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (64) hide show
  1. package/cjs/allocator/bounds-allocate.js +1 -1
  2. package/cjs/allocator/canvas-allocate.js +1 -1
  3. package/cjs/allocator/constants.js +1 -1
  4. package/cjs/allocator/graphic-allocate.js +1 -1
  5. package/cjs/allocator/matrix-allocate.js +1 -1
  6. package/cjs/canvas/constants.js +1 -2
  7. package/cjs/color-string/index.js +2 -1
  8. package/cjs/common/event-transformer.js +1 -2
  9. package/cjs/common/generator.js +2 -1
  10. package/cjs/common/rect-utils.js +1 -1
  11. package/cjs/common/render-area.js +1 -1
  12. package/cjs/common/render-command-list.js +1 -1
  13. package/cjs/common/render-curve.js +1 -1
  14. package/cjs/common/render-utils.js +1 -1
  15. package/cjs/common/seg-context.js +1 -1
  16. package/cjs/common/simplify.js +1 -1
  17. package/cjs/common/sort.js +1 -1
  18. package/cjs/common/split-path.js +1 -1
  19. package/cjs/common/store.js +1 -1
  20. package/cjs/common/text.js +2 -1
  21. package/cjs/common/utils.js +1 -1
  22. package/cjs/core/graphic-utils.js +1 -1
  23. package/cjs/core/index.js +1 -1
  24. package/cjs/core/layer-service.js +1 -2
  25. package/cjs/core/layer.js +1 -1
  26. package/cjs/core/light.js +1 -1
  27. package/cjs/core/stage.js +1 -1
  28. package/cjs/core/window.js +1 -1
  29. package/cjs/graphic/graphic.d.ts +1 -0
  30. package/cjs/graphic/graphic.js +10 -2
  31. package/cjs/graphic/graphic.js.map +1 -1
  32. package/dist/index.es.js +20 -1
  33. package/es/allocator/bounds-allocate.js +1 -1
  34. package/es/allocator/canvas-allocate.js +1 -1
  35. package/es/allocator/constants.js +1 -1
  36. package/es/allocator/graphic-allocate.js +1 -1
  37. package/es/allocator/matrix-allocate.js +1 -1
  38. package/es/canvas/constants.js +1 -2
  39. package/es/color-string/index.js +2 -1
  40. package/es/common/event-transformer.js +1 -2
  41. package/es/common/generator.js +2 -1
  42. package/es/common/rect-utils.js +1 -1
  43. package/es/common/render-area.js +1 -1
  44. package/es/common/render-command-list.js +1 -1
  45. package/es/common/render-curve.js +1 -1
  46. package/es/common/render-utils.js +1 -1
  47. package/es/common/seg-context.js +1 -1
  48. package/es/common/simplify.js +1 -1
  49. package/es/common/sort.js +1 -1
  50. package/es/common/split-path.js +1 -1
  51. package/es/common/store.js +1 -1
  52. package/es/common/text.js +2 -1
  53. package/es/common/utils.js +1 -1
  54. package/es/core/graphic-utils.js +1 -1
  55. package/es/core/index.js +1 -1
  56. package/es/core/layer-service.js +1 -2
  57. package/es/core/layer.js +1 -1
  58. package/es/core/light.js +1 -1
  59. package/es/core/stage.js +1 -1
  60. package/es/core/window.js +1 -1
  61. package/es/graphic/graphic.d.ts +1 -0
  62. package/es/graphic/graphic.js +10 -2
  63. package/es/graphic/graphic.js.map +1 -1
  64. package/package.json +3 -3
@@ -35,4 +35,4 @@ class DefaultBoundsAllocate {
35
35
  }
36
36
 
37
37
  exports.DefaultBoundsAllocate = DefaultBoundsAllocate, exports.boundsAllocate = new DefaultBoundsAllocate;
38
- //# sourceMappingURL=bounds-allocate.js.map
38
+ //# sourceMappingURL=bounds-allocate.js.map
@@ -56,4 +56,4 @@ class DefaultCanvasAllocate {
56
56
  }
57
57
 
58
58
  exports.DefaultCanvasAllocate = DefaultCanvasAllocate, exports.canvasAllocate = new DefaultCanvasAllocate;
59
- //# sourceMappingURL=canvas-allocate.js.map
59
+ //# sourceMappingURL=canvas-allocate.js.map
@@ -8,4 +8,4 @@ exports.ArcAllocate = Symbol.for("ArcAllocate"), exports.AreaAllocate = Symbol.f
8
8
  exports.CircleAllocate = Symbol.for("CircleAllocate"), exports.LineAllocate = Symbol.for("LineAllocate"),
9
9
  exports.PathAllocate = Symbol.for("PathAllocate"), exports.SymbolAllocate = Symbol.for("SymbolAllocate"),
10
10
  exports.TextAllocate = Symbol.for("TextAllocate");
11
- //# sourceMappingURL=constants.js.map
11
+ //# sourceMappingURL=constants.js.map
@@ -160,4 +160,4 @@ class DefaultGraphicMemoryManager {
160
160
  }
161
161
 
162
162
  exports.DefaultGraphicMemoryManager = DefaultGraphicMemoryManager, exports.defaultGraphicMemoryManager = new DefaultGraphicMemoryManager;
163
- //# sourceMappingURL=graphic-allocate.js.map
163
+ //# sourceMappingURL=graphic-allocate.js.map
@@ -72,4 +72,4 @@ class DefaultMat4Allocate {
72
72
 
73
73
  exports.DefaultMat4Allocate = DefaultMat4Allocate, exports.matrixAllocate = new DefaultMatrixAllocate,
74
74
  exports.mat4Allocate = new DefaultMat4Allocate;
75
- //# sourceMappingURL=matrix-allocate.js.map
75
+ //# sourceMappingURL=matrix-allocate.js.map
@@ -3,5 +3,4 @@
3
3
  Object.defineProperty(exports, "__esModule", {
4
4
  value: !0
5
5
  }), exports.Context2dFactory = exports.CanvasFactory = void 0, exports.CanvasFactory = Symbol.for("CanvasFactory"),
6
- exports.Context2dFactory = Symbol.for("Context2dFactory");
7
- //# sourceMappingURL=constants.js.map
6
+ exports.Context2dFactory = Symbol.for("Context2dFactory");
@@ -18,4 +18,5 @@ var __createBinding = this && this.__createBinding || (Object.create ? function(
18
18
  Object.defineProperty(exports, "__esModule", {
19
19
  value: !0
20
20
  }), __exportStar(require("./interpolate"), exports), __exportStar(require("./store"), exports),
21
- __exportStar(require("./colorName"), exports);
21
+ __exportStar(require("./colorName"), exports);
22
+ //# sourceMappingURL=index.js.map
@@ -123,5 +123,4 @@ function mapToCanvasPointForCanvas(nativeEvent) {
123
123
 
124
124
  exports.createEventTransformer = createEventTransformer, exports.createCanvasEventTransformer = createCanvasEventTransformer,
125
125
  exports.registerWindowEventTransformer = registerWindowEventTransformer, exports.registerGlobalEventTransformer = registerGlobalEventTransformer,
126
- exports.transformPointForCanvas = transformPointForCanvas, exports.mapToCanvasPointForCanvas = mapToCanvasPointForCanvas;
127
- //# sourceMappingURL=event-transformer.js.map
126
+ exports.transformPointForCanvas = transformPointForCanvas, exports.mapToCanvasPointForCanvas = mapToCanvasPointForCanvas;
@@ -10,4 +10,5 @@ class Generator {
10
10
  }
11
11
  }
12
12
 
13
- exports.Generator = Generator, Generator.auto_increment_id = 0;
13
+ exports.Generator = Generator, Generator.auto_increment_id = 0;
14
+ //# sourceMappingURL=generator.js.map
@@ -24,4 +24,4 @@ const vutils_1 = require("@visactor/vutils"), normalizeRectAttributes = attribut
24
24
  };
25
25
 
26
26
  exports.normalizeRectAttributes = normalizeRectAttributes;
27
- //# sourceMappingURL=rect-utils.js.map
27
+ //# sourceMappingURL=rect-utils.js.map
@@ -61,5 +61,5 @@ function drawAreaBlock(path, topList, bottomList, params) {
61
61
  path.closePath();
62
62
  }
63
63
 
64
+ exports.drawAreaSegments = drawAreaSegments;
64
65
  //# sourceMappingURL=render-area.js.map
65
- exports.drawAreaSegments = drawAreaSegments;
@@ -14,4 +14,4 @@ function renderCommandList(commandList, context, x = 0, y = 0, sx = 1, sy = 1, z
14
14
  }
15
15
 
16
16
  exports.renderCommandList = renderCommandList;
17
- //# sourceMappingURL=render-command-list.js.map
17
+ //# sourceMappingURL=render-command-list.js.map
@@ -99,4 +99,4 @@ function drawIncrementalAreaSegments(path, lastSeg, segments, params) {
99
99
 
100
100
  exports.drawSegments = drawSegments, exports.drawIncrementalSegments = drawIncrementalSegments,
101
101
  exports.drawIncrementalAreaSegments = drawIncrementalAreaSegments;
102
- //# sourceMappingURL=render-curve.js.map
102
+ //# sourceMappingURL=render-curve.js.map
@@ -19,4 +19,4 @@ function drawSegItem(ctx, curve, endPercent, params) {
19
19
  }
20
20
 
21
21
  exports.drawSegItem = drawSegItem;
22
- //# sourceMappingURL=render-utils.js.map
22
+ //# sourceMappingURL=render-utils.js.map
@@ -95,4 +95,4 @@ class ReflectSegContext extends SegContext {
95
95
  }
96
96
 
97
97
  exports.ReflectSegContext = ReflectSegContext;
98
- //# sourceMappingURL=seg-context.js.map
98
+ //# sourceMappingURL=seg-context.js.map
@@ -36,4 +36,4 @@ function flatten_simplify(points, tolerance, highestQuality) {
36
36
  Object.defineProperty(exports, "__esModule", {
37
37
  value: !0
38
38
  }), exports.flatten_simplify = void 0, exports.flatten_simplify = flatten_simplify;
39
- //# sourceMappingURL=simplify.js.map
39
+ //# sourceMappingURL=simplify.js.map
@@ -101,4 +101,4 @@ Object.defineProperty(exports, "__esModule", {
101
101
  value: !0
102
102
  }), exports.findNextGraphic = exports.foreachAsync = exports.foreach = void 0, exports.foreach = foreach,
103
103
  exports.foreachAsync = foreachAsync, exports.findNextGraphic = findNextGraphic;
104
- //# sourceMappingURL=sort.js.map
104
+ //# sourceMappingURL=sort.js.map
@@ -269,4 +269,4 @@ const splitPath = (path, count) => {
269
269
  };
270
270
 
271
271
  exports.splitPath = splitPath;
272
- //# sourceMappingURL=split-path.js.map
272
+ //# sourceMappingURL=split-path.js.map
@@ -1,2 +1,2 @@
1
1
  class StageStore {}
2
- //# sourceMappingURL=store.js.map
2
+ //# sourceMappingURL=store.js.map
@@ -33,4 +33,5 @@ function textAttributesToStyle(attrs) {
33
33
  }
34
34
 
35
35
  exports.textDrawOffsetY = textDrawOffsetY, exports.textDrawOffsetX = textDrawOffsetX,
36
- exports.textLayoutOffsetY = textLayoutOffsetY, exports.textAttributesToStyle = textAttributesToStyle;
36
+ exports.textLayoutOffsetY = textLayoutOffsetY, exports.textAttributesToStyle = textAttributesToStyle;
37
+ //# sourceMappingURL=text.js.map
@@ -163,4 +163,4 @@ const calculateLineHeight = (lineHeight, fontSize) => {
163
163
  };
164
164
 
165
165
  exports.calculateLineHeight = calculateLineHeight;
166
- //# sourceMappingURL=utils.js.map
166
+ //# sourceMappingURL=utils.js.map
@@ -162,4 +162,4 @@ class DefaultTransformUtil {
162
162
  }
163
163
 
164
164
  exports.DefaultTransformUtil = DefaultTransformUtil;
165
- //# sourceMappingURL=graphic-utils.js.map
165
+ //# sourceMappingURL=graphic-utils.js.map
package/cjs/core/index.js CHANGED
@@ -22,4 +22,4 @@ __exportStar(require("./layer"), exports), __exportStar(require("./stage"), expo
22
22
  __exportStar(require("./graphic-utils"), exports), __exportStar(require("./contributions"), exports),
23
23
  __exportStar(require("./layer-service"), exports), __exportStar(require("./constants"), exports),
24
24
  __exportStar(require("../interface/core"), exports);
25
- //# sourceMappingURL=index.js.map
25
+ //# sourceMappingURL=index.js.map
@@ -80,5 +80,4 @@ class DefaultLayerService {
80
80
  }
81
81
 
82
82
  exports.DefaultLayerService = DefaultLayerService, DefaultLayerService.idprefix = "visactor_layer",
83
- DefaultLayerService.prefix_count = 0;
84
- //# sourceMappingURL=layer-service.js.map
83
+ DefaultLayerService.prefix_count = 0;
package/cjs/core/layer.js CHANGED
@@ -116,4 +116,4 @@ class Layer extends group_1.Group {
116
116
  }
117
117
 
118
118
  exports.Layer = Layer;
119
- //# sourceMappingURL=layer.js.map
119
+ //# sourceMappingURL=layer.js.map
package/cjs/core/light.js CHANGED
@@ -29,4 +29,4 @@ const registerDirectionalLight = () => {
29
29
  };
30
30
 
31
31
  exports.registerDirectionalLight = registerDirectionalLight;
32
- //# sourceMappingURL=light.js.map
32
+ //# sourceMappingURL=light.js.map
package/cjs/core/stage.js CHANGED
@@ -571,4 +571,4 @@ class Stage extends group_1.Group {
571
571
  }
572
572
 
573
573
  exports.Stage = Stage;
574
- //# sourceMappingURL=stage.js.map
574
+ //# sourceMappingURL=stage.js.map
@@ -150,4 +150,4 @@ class DefaultWindow extends event_listener_manager_1.EventListenerManager {
150
150
  }
151
151
 
152
152
  exports.DefaultWindow = DefaultWindow;
153
- //# sourceMappingURL=window.js.map
153
+ //# sourceMappingURL=window.js.map
@@ -149,6 +149,7 @@ export declare abstract class Graphic<T extends Partial<IGraphicAttribute> = Par
149
149
  };
150
150
  protected recomputeCurrentStatePatch(): void;
151
151
  protected buildStaticAttributeSnapshot(): Partial<T>;
152
+ protected buildStateAnimationTargetAttrs(resolvedStateAttrs: Partial<T>, previousResolvedStatePatch?: Partial<T>): Partial<T>;
152
153
  protected syncObjectToSnapshot(target: Record<string, any>, snapshot: Record<string, any>): AttributeDelta;
153
154
  protected _syncAttribute(): AttributeDelta;
154
155
  protected _syncFinalAttributeFromStaticTruth(): void;
@@ -254,6 +254,14 @@ class Graphic extends node_tree_1.Node {
254
254
  "deep" === this.stateMergeMode && isPlainObjectValue(previousValue) && isPlainObjectValue(nextValue) ? snapshot[key] = deepMergeAttributeValue(previousValue, nextValue) : snapshot[key] = cloneAttributeValue(nextValue);
255
255
  })), snapshot) : snapshot;
256
256
  }
257
+ buildStateAnimationTargetAttrs(resolvedStateAttrs, previousResolvedStatePatch) {
258
+ const targetAttrs = cloneAttributeValue(resolvedStateAttrs);
259
+ if (!previousResolvedStatePatch) return targetAttrs;
260
+ const snapshot = this.buildStaticAttributeSnapshot();
261
+ return Object.keys(previousResolvedStatePatch).forEach((key => {
262
+ Object.prototype.hasOwnProperty.call(targetAttrs, key) || (targetAttrs[key] = Object.prototype.hasOwnProperty.call(snapshot, key) ? cloneAttributeValue(snapshot[key]) : this.getDefaultAttribute(key));
263
+ })), targetAttrs;
264
+ }
257
265
  syncObjectToSnapshot(target, snapshot) {
258
266
  const delta = new Map;
259
267
  return new Set([ ...Object.keys(target), ...Object.keys(snapshot) ]).forEach((key => {
@@ -743,7 +751,7 @@ class Graphic extends node_tree_1.Node {
743
751
  useStates(states, hasAnimation) {
744
752
  var _a, _b, _c, _d, _e;
745
753
  if (!states.length) return void this.clearStates(hasAnimation);
746
- const previousStates = this.currentStates ? this.currentStates.slice() : [], stateResolveBaseAttrs = null !== (_a = this.baseAttributes) && void 0 !== _a ? _a : this.attribute, stateModel = this.createStateModel();
754
+ const previousStates = this.currentStates ? this.currentStates.slice() : [], previousResolvedStatePatch = this.resolvedStatePatch ? cloneAttributeValue(this.resolvedStatePatch) : void 0, stateResolveBaseAttrs = null !== (_a = this.baseAttributes) && void 0 !== _a ? _a : this.attribute, stateModel = this.createStateModel();
747
755
  null === (_b = this.stateEngine) || void 0 === _b || _b.setResolveContext(this, stateResolveBaseAttrs);
748
756
  const transition = stateModel.useStates(states);
749
757
  if (!transition.changed && this.sameStateNames(previousStates, transition.states)) return;
@@ -755,7 +763,7 @@ class Graphic extends node_tree_1.Node {
755
763
  null === (_e = (0, state_perf_monitor_1.getStageStatePerfMonitor)(this.stage)) || void 0 === _e || _e.recordEvent("state-commit", {
756
764
  graphicId: this._uid,
757
765
  targetStates: [ ...transition.states ]
758
- }), hasAnimation ? (this._syncFinalAttributeFromStaticTruth(), this.applyStateAttrs(resolvedStateAttrs, transition.states, hasAnimation)) : (this.stopStateAnimates(),
766
+ }), hasAnimation ? (this._syncFinalAttributeFromStaticTruth(), this.applyStateAttrs(this.buildStateAnimationTargetAttrs(resolvedStateAttrs, previousResolvedStatePatch), transition.states, hasAnimation)) : (this.stopStateAnimates(),
759
767
  this._restoreAttributeFromStaticTruth({
760
768
  type: enums_1.AttributeUpdateType.STATE
761
769
  }), this._emitCustomEvent("afterStateUpdate", {