@leafer-draw/miniapp 1.0.2 → 1.0.4

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.
@@ -119,11 +119,18 @@ const MathHelper = {
119
119
  scaleData.scaleX = (typeof size === 'number' ? size : size.width) / originSize.width;
120
120
  scaleData.scaleY = (typeof size === 'number' ? size : size.height) / originSize.height;
121
121
  }
122
- else if (scale) {
123
- scaleData.scaleX = typeof scale === 'number' ? scale : scale.x;
124
- scaleData.scaleY = typeof scale === 'number' ? scale : scale.y;
125
- }
122
+ else if (scale)
123
+ MathHelper.assignScale(scaleData, scale);
126
124
  return scaleData;
125
+ },
126
+ assignScale(scaleData, scale) {
127
+ if (typeof scale === 'number') {
128
+ scaleData.scaleX = scaleData.scaleY = scale;
129
+ }
130
+ else {
131
+ scaleData.scaleX = scale.x;
132
+ scaleData.scaleY = scale.y;
133
+ }
127
134
  }
128
135
  };
129
136
  const OneRadian = PI$4 / 180;
@@ -1255,7 +1262,6 @@ const AroundHelper = {
1255
1262
  tempPoint: {},
1256
1263
  get: get$4,
1257
1264
  toPoint(around, bounds, to, onlySize, pointBounds) {
1258
- to || (to = {});
1259
1265
  const point = get$4(around);
1260
1266
  to.x = point.x;
1261
1267
  to.y = point.y;
@@ -1390,6 +1396,10 @@ const Run = {
1390
1396
  };
1391
1397
  const R = Run;
1392
1398
 
1399
+ function needPlugin(name) {
1400
+ console.error('need plugin: @leafer-in/' + name);
1401
+ }
1402
+
1393
1403
  const debug$c = Debug.get('UICreator');
1394
1404
  const UICreator = {
1395
1405
  list: {},
@@ -1652,6 +1662,9 @@ var Answer;
1652
1662
  Answer[Answer["YesAndSkip"] = 3] = "YesAndSkip";
1653
1663
  })(Answer || (Answer = {}));
1654
1664
  const emptyData = {};
1665
+ function isNull(value) {
1666
+ return value === undefined || value === null;
1667
+ }
1655
1668
 
1656
1669
  /******************************************************************************
1657
1670
  Copyright (c) Microsoft Corporation.
@@ -2417,7 +2430,7 @@ const BezierHelper = {
2417
2430
  let startY = y = rotationSin * radiusX * startCos + rotationCos * radiusY * startSin;
2418
2431
  let fromX = cx + x, fromY = cy + y;
2419
2432
  if (data)
2420
- data.push(L$6, fromX, fromY);
2433
+ data.push(data.length ? L$6 : M$5, fromX, fromY);
2421
2434
  if (setPointBounds)
2422
2435
  setPoint$2(setPointBounds, fromX, fromY);
2423
2436
  if (setStartPoint)
@@ -3086,8 +3099,7 @@ const PathBounds = {
3086
3099
  toTwoPointBounds(data, setPointBounds) {
3087
3100
  if (!data || !data.length)
3088
3101
  return setPoint$1(setPointBounds, 0, 0);
3089
- let command;
3090
- let i = 0, x = 0, y = 0, x1, y1, toX, toY;
3102
+ let i = 0, x = 0, y = 0, x1, y1, toX, toY, command;
3091
3103
  const len = data.length;
3092
3104
  while (i < len) {
3093
3105
  command = data[i];
@@ -3743,7 +3755,7 @@ function autoLayoutType(defaultValue) {
3743
3755
  set(value) {
3744
3756
  if (this.__setAttr(key, value)) {
3745
3757
  this.__layout.matrixChanged || this.__layout.matrixChange();
3746
- this.__hasAutoLayout = !!value;
3758
+ this.__hasAutoLayout = !!(this.origin || this.around || this.flow);
3747
3759
  if (!this.__local)
3748
3760
  this.__layout.createLocal();
3749
3761
  }
@@ -3836,14 +3848,25 @@ function visibleType(defaultValue) {
3836
3848
  return decorateLeafAttr(defaultValue, (key) => attr({
3837
3849
  set(value) {
3838
3850
  const oldValue = this.visible;
3839
- if (this.__setAttr(key, value)) {
3840
- this.__layout.opacityChanged || this.__layout.opacityChange();
3841
- if (oldValue === 0 || value === 0)
3842
- doBoundsType(this);
3851
+ if (oldValue === true && value === 0) {
3852
+ if (this.animationOut)
3853
+ return this.__runAnimation('out', () => doVisible(this, key, value, oldValue));
3854
+ }
3855
+ else if (oldValue === 0 && value === true) {
3856
+ if (this.animation)
3857
+ this.__runAnimation('in');
3843
3858
  }
3859
+ doVisible(this, key, value, oldValue);
3844
3860
  }
3845
3861
  }));
3846
3862
  }
3863
+ function doVisible(leaf, key, value, oldValue) {
3864
+ if (leaf.__setAttr(key, value)) {
3865
+ leaf.__layout.opacityChanged || leaf.__layout.opacityChange();
3866
+ if (oldValue === 0 || value === 0)
3867
+ doBoundsType(leaf);
3868
+ }
3869
+ }
3847
3870
  function sortType(defaultValue) {
3848
3871
  return decorateLeafAttr(defaultValue, (key) => attr({
3849
3872
  set(value) {
@@ -3927,7 +3950,16 @@ function defineDataProcessor(target, key, defaultValue) {
3927
3950
  if (defaultValue === undefined) {
3928
3951
  property.get = function () { return this[computedKey]; };
3929
3952
  }
3930
- else if (key === 'width') {
3953
+ else if (typeof defaultValue === 'object') {
3954
+ const { clone } = DataHelper;
3955
+ property.get = function () {
3956
+ let v = this[computedKey];
3957
+ if (v === undefined)
3958
+ this[computedKey] = v = clone(defaultValue);
3959
+ return v;
3960
+ };
3961
+ }
3962
+ if (key === 'width') {
3931
3963
  property.get = function () {
3932
3964
  const v = this[computedKey];
3933
3965
  if (v === undefined) {
@@ -4451,15 +4483,16 @@ class LeafLayout {
4451
4483
  }
4452
4484
  getLayoutBounds(type, relative = 'world', unscale) {
4453
4485
  const { leaf } = this;
4454
- let point, matrix, bounds = this.getInnerBounds(type);
4486
+ let point, matrix, layoutBounds, bounds = this.getInnerBounds(type);
4455
4487
  switch (relative) {
4456
4488
  case 'world':
4457
4489
  point = leaf.getWorldPoint(bounds);
4458
4490
  matrix = leaf.__world;
4459
4491
  break;
4460
4492
  case 'local':
4493
+ const { scaleX, scaleY, rotation, skewX, skewY } = leaf.__;
4494
+ layoutBounds = { scaleX, scaleY, rotation, skewX, skewY };
4461
4495
  point = leaf.getLocalPointByInner(bounds);
4462
- matrix = leaf.__localMatrix;
4463
4496
  break;
4464
4497
  case 'inner':
4465
4498
  point = bounds;
@@ -4471,7 +4504,8 @@ class LeafLayout {
4471
4504
  point = leaf.getWorldPoint(bounds, relative);
4472
4505
  matrix = getRelativeWorld$1(leaf, relative, true);
4473
4506
  }
4474
- const layoutBounds = MatrixHelper.getLayout(matrix);
4507
+ if (!layoutBounds)
4508
+ layoutBounds = MatrixHelper.getLayout(matrix);
4475
4509
  copy$5(layoutBounds, bounds);
4476
4510
  PointHelper.copy(layoutBounds, point);
4477
4511
  if (unscale) {
@@ -4594,144 +4628,6 @@ class LeafLayout {
4594
4628
  destroy() { }
4595
4629
  }
4596
4630
 
4597
- const empty = {};
4598
- const LeafEventer = {
4599
- on(type, listener, options) {
4600
- let capture, once;
4601
- if (options) {
4602
- if (options === 'once') {
4603
- once = true;
4604
- }
4605
- else if (typeof options === 'boolean') {
4606
- capture = options;
4607
- }
4608
- else {
4609
- capture = options.capture;
4610
- once = options.once;
4611
- }
4612
- }
4613
- let events;
4614
- const map = __getListenerMap(this, capture, true);
4615
- const typeList = typeof type === 'string' ? type.split(' ') : type;
4616
- const item = once ? { listener, once } : { listener };
4617
- typeList.forEach(type => {
4618
- if (type) {
4619
- events = map[type];
4620
- if (events) {
4621
- if (events.findIndex(item => item.listener === listener) === -1)
4622
- events.push(item);
4623
- }
4624
- else {
4625
- map[type] = [item];
4626
- }
4627
- }
4628
- });
4629
- },
4630
- off(type, listener, options) {
4631
- if (type) {
4632
- const typeList = typeof type === 'string' ? type.split(' ') : type;
4633
- if (listener) {
4634
- let capture;
4635
- if (options)
4636
- capture = typeof options === 'boolean' ? options : (options === 'once' ? false : options.capture);
4637
- let events, index;
4638
- const map = __getListenerMap(this, capture);
4639
- typeList.forEach(type => {
4640
- if (type) {
4641
- events = map[type];
4642
- if (events) {
4643
- index = events.findIndex(item => item.listener === listener);
4644
- if (index > -1)
4645
- events.splice(index, 1);
4646
- if (!events.length)
4647
- delete map[type];
4648
- }
4649
- }
4650
- });
4651
- }
4652
- else {
4653
- const { __bubbleMap: b, __captureMap: c } = this;
4654
- typeList.forEach(type => {
4655
- if (b)
4656
- delete b[type];
4657
- if (c)
4658
- delete c[type];
4659
- });
4660
- }
4661
- }
4662
- else {
4663
- this.__bubbleMap = this.__captureMap = undefined;
4664
- }
4665
- },
4666
- on_(type, listener, bind, options) {
4667
- if (bind)
4668
- listener = listener.bind(bind);
4669
- this.on(type, listener, options);
4670
- return { type, current: this, listener, options };
4671
- },
4672
- off_(id) {
4673
- if (!id)
4674
- return;
4675
- const list = id instanceof Array ? id : [id];
4676
- list.forEach(item => item.current.off(item.type, item.listener, item.options));
4677
- list.length = 0;
4678
- },
4679
- once(type, listener, capture) {
4680
- this.on(type, listener, { once: true, capture });
4681
- },
4682
- emit(type, event, capture) {
4683
- if (!event && EventCreator.has(type))
4684
- event = EventCreator.get(type, { type, target: this, current: this });
4685
- const map = __getListenerMap(this, capture);
4686
- const list = map[type];
4687
- if (list) {
4688
- let item;
4689
- for (let i = 0, len = list.length; i < len; i++) {
4690
- item = list[i];
4691
- item.listener(event);
4692
- if (item.once) {
4693
- this.off(type, item.listener, capture);
4694
- i--, len--;
4695
- }
4696
- if (event && event.isStopNow)
4697
- break;
4698
- }
4699
- }
4700
- this.syncEventer && this.syncEventer.emitEvent(event, capture);
4701
- },
4702
- emitEvent(event, capture) {
4703
- event.current = this;
4704
- this.emit(event.type, event, capture);
4705
- },
4706
- hasEvent(type, capture) {
4707
- if (this.syncEventer && this.syncEventer.hasEvent(type, capture))
4708
- return true;
4709
- const { __bubbleMap: b, __captureMap: c } = this;
4710
- const hasB = b && b[type], hasC = c && c[type];
4711
- return !!(capture === undefined ? (hasB || hasC) : (capture ? hasC : hasB));
4712
- },
4713
- };
4714
- function __getListenerMap(eventer, capture, create) {
4715
- if (capture) {
4716
- const { __captureMap: c } = eventer;
4717
- if (c) {
4718
- return c;
4719
- }
4720
- else {
4721
- return create ? eventer.__captureMap = {} : empty;
4722
- }
4723
- }
4724
- else {
4725
- const { __bubbleMap: b } = eventer;
4726
- if (b) {
4727
- return b;
4728
- }
4729
- else {
4730
- return create ? eventer.__bubbleMap = {} : empty;
4731
- }
4732
- }
4733
- }
4734
-
4735
4631
  class Event {
4736
4632
  constructor(type, target) {
4737
4633
  this.bubbles = false;
@@ -4766,7 +4662,10 @@ class ChildEvent extends Event {
4766
4662
  }
4767
4663
  ChildEvent.ADD = 'child.add';
4768
4664
  ChildEvent.REMOVE = 'child.remove';
4769
- ChildEvent.DESTROY = 'child.destroy';
4665
+ ChildEvent.CREATED = 'created';
4666
+ ChildEvent.MOUNTED = 'mounted';
4667
+ ChildEvent.UNMOUNTED = 'unmounted';
4668
+ ChildEvent.DESTROY = 'destroy';
4770
4669
 
4771
4670
  class PropertyEvent extends Event {
4772
4671
  constructor(type, target, attrName, oldValue, newValue) {
@@ -4844,10 +4743,6 @@ LayoutEvent.AFTER = 'layout.after';
4844
4743
  LayoutEvent.AGAIN = 'layout.again';
4845
4744
  LayoutEvent.END = 'layout.end';
4846
4745
 
4847
- class AnimateEvent extends Event {
4848
- }
4849
- AnimateEvent.FRAME = 'animate.frame';
4850
-
4851
4746
  class RenderEvent extends Event {
4852
4747
  constructor(type, times, bounds, options) {
4853
4748
  super(type);
@@ -4880,6 +4775,157 @@ LeaferEvent.STOP = 'leafer.stop';
4880
4775
  LeaferEvent.RESTART = 'leafer.restart';
4881
4776
  LeaferEvent.END = 'leafer.end';
4882
4777
 
4778
+ const empty = {};
4779
+ class Eventer {
4780
+ set event(map) { this.on(map); }
4781
+ on(type, listener, options) {
4782
+ if (!listener) {
4783
+ let event, map = type;
4784
+ for (let key in map)
4785
+ event = map[key], event instanceof Array ? this.on(key, event[0], event[1]) : this.on(key, event);
4786
+ return;
4787
+ }
4788
+ let capture, once;
4789
+ if (options) {
4790
+ if (options === 'once') {
4791
+ once = true;
4792
+ }
4793
+ else if (typeof options === 'boolean') {
4794
+ capture = options;
4795
+ }
4796
+ else {
4797
+ capture = options.capture;
4798
+ once = options.once;
4799
+ }
4800
+ }
4801
+ let events;
4802
+ const map = __getListenerMap(this, capture, true);
4803
+ const typeList = typeof type === 'string' ? type.split(' ') : type;
4804
+ const item = once ? { listener, once } : { listener };
4805
+ typeList.forEach(type => {
4806
+ if (type) {
4807
+ events = map[type];
4808
+ if (events) {
4809
+ if (events.findIndex(item => item.listener === listener) === -1)
4810
+ events.push(item);
4811
+ }
4812
+ else {
4813
+ map[type] = [item];
4814
+ }
4815
+ }
4816
+ });
4817
+ }
4818
+ off(type, listener, options) {
4819
+ if (type) {
4820
+ const typeList = typeof type === 'string' ? type.split(' ') : type;
4821
+ if (listener) {
4822
+ let capture;
4823
+ if (options)
4824
+ capture = typeof options === 'boolean' ? options : (options === 'once' ? false : options.capture);
4825
+ let events, index;
4826
+ const map = __getListenerMap(this, capture);
4827
+ typeList.forEach(type => {
4828
+ if (type) {
4829
+ events = map[type];
4830
+ if (events) {
4831
+ index = events.findIndex(item => item.listener === listener);
4832
+ if (index > -1)
4833
+ events.splice(index, 1);
4834
+ if (!events.length)
4835
+ delete map[type];
4836
+ }
4837
+ }
4838
+ });
4839
+ }
4840
+ else {
4841
+ const { __bubbleMap: b, __captureMap: c } = this;
4842
+ typeList.forEach(type => {
4843
+ if (b)
4844
+ delete b[type];
4845
+ if (c)
4846
+ delete c[type];
4847
+ });
4848
+ }
4849
+ }
4850
+ else {
4851
+ this.__bubbleMap = this.__captureMap = undefined;
4852
+ }
4853
+ }
4854
+ on_(type, listener, bind, options) {
4855
+ if (bind)
4856
+ listener = listener.bind(bind);
4857
+ this.on(type, listener, options);
4858
+ return { type, current: this, listener, options };
4859
+ }
4860
+ off_(id) {
4861
+ if (!id)
4862
+ return;
4863
+ const list = id instanceof Array ? id : [id];
4864
+ list.forEach(item => item.current.off(item.type, item.listener, item.options));
4865
+ list.length = 0;
4866
+ }
4867
+ once(type, listener, capture) {
4868
+ this.on(type, listener, { once: true, capture });
4869
+ }
4870
+ emit(type, event, capture) {
4871
+ if (!event && EventCreator.has(type))
4872
+ event = EventCreator.get(type, { type, target: this, current: this });
4873
+ const map = __getListenerMap(this, capture);
4874
+ const list = map[type];
4875
+ if (list) {
4876
+ let item;
4877
+ for (let i = 0, len = list.length; i < len; i++) {
4878
+ item = list[i];
4879
+ item.listener(event);
4880
+ if (item.once) {
4881
+ this.off(type, item.listener, capture);
4882
+ i--, len--;
4883
+ }
4884
+ if (event && event.isStopNow)
4885
+ break;
4886
+ }
4887
+ }
4888
+ this.syncEventer && this.syncEventer.emitEvent(event, capture);
4889
+ }
4890
+ emitEvent(event, capture) {
4891
+ event.current = this;
4892
+ this.emit(event.type, event, capture);
4893
+ }
4894
+ hasEvent(type, capture) {
4895
+ if (this.syncEventer && this.syncEventer.hasEvent(type, capture))
4896
+ return true;
4897
+ const { __bubbleMap: b, __captureMap: c } = this;
4898
+ const hasB = b && b[type], hasC = c && c[type];
4899
+ return !!(capture === undefined ? (hasB || hasC) : (capture ? hasC : hasB));
4900
+ }
4901
+ destroy() {
4902
+ this.__captureMap = this.__bubbleMap = this.syncEventer = null;
4903
+ }
4904
+ }
4905
+ function __getListenerMap(eventer, capture, create) {
4906
+ if (capture) {
4907
+ const { __captureMap: c } = eventer;
4908
+ if (c) {
4909
+ return c;
4910
+ }
4911
+ else {
4912
+ return create ? eventer.__captureMap = {} : empty;
4913
+ }
4914
+ }
4915
+ else {
4916
+ const { __bubbleMap: b } = eventer;
4917
+ if (b) {
4918
+ return b;
4919
+ }
4920
+ else {
4921
+ return create ? eventer.__bubbleMap = {} : empty;
4922
+ }
4923
+ }
4924
+ }
4925
+
4926
+ const { on, on_, off, off_, once, emit: emit$1, emitEvent, hasEvent, destroy } = Eventer.prototype;
4927
+ const LeafEventer = { on, on_, off, off_, once, emit: emit$1, emitEvent, hasEvent, destroyEventer: destroy };
4928
+
4883
4929
  const { isFinite } = Number;
4884
4930
  const debug$5 = Debug.get('setAttr');
4885
4931
  const LeafDataProxy = {
@@ -4891,9 +4937,7 @@ const LeafDataProxy = {
4891
4937
  newValue = undefined;
4892
4938
  }
4893
4939
  if (typeof newValue === 'object' || oldValue !== newValue) {
4894
- this.__[name] = newValue;
4895
- if (this.__proxyData)
4896
- this.setProxyAttr(name, newValue);
4940
+ this.__realSetAttr(name, newValue);
4897
4941
  const { CHANGE } = PropertyEvent;
4898
4942
  const event = new PropertyEvent(CHANGE, this, name, oldValue, newValue);
4899
4943
  if (this.isLeafer) {
@@ -4911,12 +4955,18 @@ const LeafDataProxy = {
4911
4955
  }
4912
4956
  }
4913
4957
  else {
4914
- this.__[name] = newValue;
4915
- if (this.__proxyData)
4916
- this.setProxyAttr(name, newValue);
4958
+ this.__realSetAttr(name, newValue);
4917
4959
  return true;
4918
4960
  }
4919
4961
  },
4962
+ __realSetAttr(name, newValue) {
4963
+ const data = this.__;
4964
+ data[name] = newValue;
4965
+ if (this.__proxyData)
4966
+ this.setProxyAttr(name, newValue);
4967
+ if (data.normalStyle)
4968
+ this.lockNormalStyle || data.normalStyle[name] === undefined || (data.normalStyle[name] = newValue);
4969
+ },
4920
4970
  __getAttr(name) {
4921
4971
  if (this.__proxyData)
4922
4972
  return this.getProxyAttr(name);
@@ -5019,6 +5069,8 @@ const LeafBounds = {
5019
5069
  layout.boundsChanged = false;
5020
5070
  },
5021
5071
  __updateLocalBoxBounds() {
5072
+ if (this.__hasMotionPath)
5073
+ this.__updateMotionPath();
5022
5074
  if (this.__hasAutoLayout)
5023
5075
  this.__updateAutoLayout();
5024
5076
  toOuterOf$1(this.__layout.boxBounds, this.__local, this.__local);
@@ -5171,7 +5223,7 @@ const BranchRender = {
5171
5223
  const { LEAF, create } = IncrementId;
5172
5224
  const { toInnerPoint, toOuterPoint, multiplyParent } = MatrixHelper;
5173
5225
  const { toOuterOf } = BoundsHelper;
5174
- const { copy: copy$3 } = PointHelper;
5226
+ const { copy: copy$3, move } = PointHelper;
5175
5227
  const { moveLocal, zoomOfLocal, rotateOfLocal, skewOfLocal, moveWorld, zoomOfWorld, rotateOfWorld, skewOfWorld, transform, transformWorld, setTransform, getFlipTransform, getLocalOrigin, getRelativeWorld, drop } = LeafHelper;
5176
5228
  let Leaf = class Leaf {
5177
5229
  get tag() { return this.__tag; }
@@ -5198,13 +5250,16 @@ let Leaf = class Leaf {
5198
5250
  get __ignoreHitWorld() { return (this.__hasMask || this.__hasEraser) && this.__.hitChildren; }
5199
5251
  get __inLazyBounds() { const { leafer } = this; return leafer && leafer.created && leafer.lazyBounds.hit(this.__world); }
5200
5252
  get pathInputed() { return this.__.__pathInputed; }
5201
- set event(map) { let event; for (let key in map)
5202
- event = map[key], event instanceof Array ? this.on(key, event[0], event[1]) : this.on(key, event); }
5253
+ set event(map) { this.on(map); }
5203
5254
  constructor(data) {
5204
5255
  this.innerId = create(LEAF);
5205
5256
  this.reset(data);
5257
+ if (this.__bubbleMap)
5258
+ this.__emitLifeEvent(ChildEvent.CREATED);
5206
5259
  }
5207
5260
  reset(data) {
5261
+ if (this.leafer)
5262
+ this.leafer.forceRender(this.__world);
5208
5263
  this.__world = { a: 1, b: 0, c: 0, d: 1, e: 0, f: 0, x: 0, y: 0, width: 0, height: 0, scaleX: 1, scaleY: 1 };
5209
5264
  if (data !== null)
5210
5265
  this.__local = { a: 1, b: 0, c: 0, d: 1, e: 0, f: 0, x: 0, y: 0, width: 0, height: 0 };
@@ -5226,12 +5281,12 @@ let Leaf = class Leaf {
5226
5281
  waitParent(item, bind) {
5227
5282
  if (bind)
5228
5283
  item = item.bind(bind);
5229
- this.parent ? item() : (this.__parentWait ? this.__parentWait.push(item) : this.__parentWait = [item]);
5284
+ this.parent ? item() : this.on(ChildEvent.ADD, item, 'once');
5230
5285
  }
5231
5286
  waitLeafer(item, bind) {
5232
5287
  if (bind)
5233
5288
  item = item.bind(bind);
5234
- this.leafer ? item() : (this.__leaferWait ? this.__leaferWait.push(item) : this.__leaferWait = [item]);
5289
+ this.leafer ? item() : this.on(ChildEvent.MOUNTED, item, 'once');
5235
5290
  }
5236
5291
  nextRender(item, bind, off) {
5237
5292
  this.leafer ? this.leafer.nextRender(item, bind, off) : this.waitLeafer(() => this.leafer.nextRender(item, bind, off));
@@ -5240,18 +5295,21 @@ let Leaf = class Leaf {
5240
5295
  this.nextRender(item, null, 'off');
5241
5296
  }
5242
5297
  __bindLeafer(leafer) {
5243
- if (this.isLeafer) {
5244
- if (leafer !== null)
5245
- leafer = this;
5246
- }
5298
+ if (this.isLeafer && leafer !== null)
5299
+ leafer = this;
5247
5300
  if (this.leafer && !leafer)
5248
5301
  this.leafer.leafs--;
5249
5302
  this.leafer = leafer;
5250
5303
  if (leafer) {
5251
5304
  leafer.leafs++;
5252
5305
  this.__level = this.parent ? this.parent.__level + 1 : 1;
5253
- if (this.__leaferWait)
5254
- WaitHelper.run(this.__leaferWait);
5306
+ if (this.animation)
5307
+ this.__runAnimation('in');
5308
+ if (this.__bubbleMap)
5309
+ this.__emitLifeEvent(ChildEvent.MOUNTED);
5310
+ }
5311
+ else {
5312
+ this.__emitLifeEvent(ChildEvent.UNMOUNTED);
5255
5313
  }
5256
5314
  if (this.isBranch) {
5257
5315
  const { children } = this;
@@ -5260,7 +5318,7 @@ let Leaf = class Leaf {
5260
5318
  }
5261
5319
  }
5262
5320
  }
5263
- set(_data) { }
5321
+ set(_data, _isTemp) { }
5264
5322
  get(_name) { return undefined; }
5265
5323
  setAttr(name, value) { this[name] = value; }
5266
5324
  getAttr(name) { return this[name]; }
@@ -5285,6 +5343,7 @@ let Leaf = class Leaf {
5285
5343
  findOne(_condition, _options) { return undefined; }
5286
5344
  findId(_id) { return undefined; }
5287
5345
  focus(_value) { }
5346
+ updateState() { }
5288
5347
  updateLayout() {
5289
5348
  this.__layout.update();
5290
5349
  }
@@ -5392,11 +5451,24 @@ let Leaf = class Leaf {
5392
5451
  if (relative)
5393
5452
  relative.worldToInner(to ? to : inner, null, distance);
5394
5453
  }
5454
+ getBoxPoint(world, relative, distance, change) {
5455
+ return this.getBoxPointByInner(this.getInnerPoint(world, relative, distance, change), null, null, true);
5456
+ }
5457
+ getBoxPointByInner(inner, _relative, _distance, change) {
5458
+ const point = change ? inner : Object.assign({}, inner), { x, y } = this.boxBounds;
5459
+ move(point, -x, -y);
5460
+ return point;
5461
+ }
5395
5462
  getInnerPoint(world, relative, distance, change) {
5396
5463
  const point = change ? world : {};
5397
5464
  this.worldToInner(world, point, distance, relative);
5398
5465
  return point;
5399
5466
  }
5467
+ getInnerPointByBox(box, _relative, _distance, change) {
5468
+ const point = change ? box : Object.assign({}, box), { x, y } = this.boxBounds;
5469
+ move(point, x, y);
5470
+ return point;
5471
+ }
5400
5472
  getInnerPointByLocal(local, _relative, distance, change) {
5401
5473
  return this.getInnerPoint(local, this.parent, distance, change);
5402
5474
  }
@@ -5408,20 +5480,23 @@ let Leaf = class Leaf {
5408
5480
  getLocalPointByInner(inner, _relative, distance, change) {
5409
5481
  return this.getWorldPoint(inner, this.parent, distance, change);
5410
5482
  }
5483
+ getPagePoint(world, relative, distance, change) {
5484
+ const layer = this.leafer ? this.leafer.zoomLayer : this;
5485
+ return layer.getInnerPoint(world, relative, distance, change);
5486
+ }
5411
5487
  getWorldPoint(inner, relative, distance, change) {
5412
5488
  const point = change ? inner : {};
5413
5489
  this.innerToWorld(inner, point, distance, relative);
5414
5490
  return point;
5415
5491
  }
5492
+ getWorldPointByBox(box, relative, distance, change) {
5493
+ return this.getWorldPoint(this.getInnerPointByBox(box, null, null, change), relative, distance, true);
5494
+ }
5416
5495
  getWorldPointByLocal(local, relative, distance, change) {
5417
5496
  const point = change ? local : {};
5418
5497
  this.localToWorld(local, point, distance, relative);
5419
5498
  return point;
5420
5499
  }
5421
- getPagePoint(world, relative, distance, change) {
5422
- const layer = this.leafer ? this.leafer.zoomLayer : this;
5423
- return layer.getInnerPoint(world, relative, distance, change);
5424
- }
5425
5500
  getWorldPointByPage(page, relative, distance, change) {
5426
5501
  const layer = this.leafer ? this.leafer.zoomLayer : this;
5427
5502
  return layer.getWorldPoint(page, relative, distance, change);
@@ -5490,6 +5565,17 @@ let Leaf = class Leaf {
5490
5565
  __drawRenderPath(_canvas) { }
5491
5566
  __updatePath() { }
5492
5567
  __updateRenderPath() { }
5568
+ getMotionPathData() {
5569
+ return needPlugin('path');
5570
+ }
5571
+ getMotionPoint(_motionDistance) {
5572
+ return needPlugin('path');
5573
+ }
5574
+ getMotionTotal() {
5575
+ return 0;
5576
+ }
5577
+ __updateMotionPath() { }
5578
+ __runAnimation(_type, _complete) { }
5493
5579
  __updateSortChildren() { }
5494
5580
  add(_child, _index) { }
5495
5581
  remove(_child, destroy) {
@@ -5515,6 +5601,10 @@ let Leaf = class Leaf {
5515
5601
  fn = boundsType;
5516
5602
  fn(defaultValue)(this.prototype, attrName);
5517
5603
  }
5604
+ __emitLifeEvent(type) {
5605
+ if (this.hasEvent(type))
5606
+ this.emitEvent(new ChildEvent(type, this, this.parent));
5607
+ }
5518
5608
  destroy() {
5519
5609
  if (!this.destroyed) {
5520
5610
  const { parent } = this;
@@ -5522,11 +5612,10 @@ let Leaf = class Leaf {
5522
5612
  this.remove();
5523
5613
  if (this.children)
5524
5614
  this.removeAll(true);
5525
- if (this.hasEvent(ChildEvent.DESTROY))
5526
- this.emitEvent(new ChildEvent(ChildEvent.DESTROY, this, parent));
5615
+ this.__emitLifeEvent(ChildEvent.DESTROY);
5527
5616
  this.__.destroy();
5528
5617
  this.__layout.destroy();
5529
- this.__captureMap = this.__bubbleMap = this.__parentWait = this.__leaferWait = null;
5618
+ this.destroyEventer();
5530
5619
  this.destroyed = true;
5531
5620
  }
5532
5621
  }
@@ -5592,8 +5681,8 @@ let Branch = class Branch extends Leaf {
5592
5681
  this.__.__childBranchNumber = (this.__.__childBranchNumber || 0) + 1;
5593
5682
  child.__layout.boxChanged || child.__layout.boxChange();
5594
5683
  child.__layout.matrixChanged || child.__layout.matrixChange();
5595
- if (child.__parentWait)
5596
- WaitHelper.run(child.__parentWait);
5684
+ if (child.__bubbleMap)
5685
+ child.__emitLifeEvent(ChildEvent.ADD);
5597
5686
  if (this.leafer) {
5598
5687
  child.__bindLeafer(this.leafer);
5599
5688
  if (this.leafer.created)
@@ -5606,16 +5695,10 @@ let Branch = class Branch extends Leaf {
5606
5695
  }
5607
5696
  remove(child, destroy) {
5608
5697
  if (child) {
5609
- const index = this.children.indexOf(child);
5610
- if (index > -1) {
5611
- this.children.splice(index, 1);
5612
- if (child.isBranch)
5613
- this.__.__childBranchNumber = (this.__.__childBranchNumber || 1) - 1;
5614
- this.__preRemove();
5615
- this.__realRemoveChild(child);
5616
- if (destroy)
5617
- child.destroy();
5618
- }
5698
+ if (child.animationOut)
5699
+ child.__runAnimation('out', () => this.__remove(child, destroy));
5700
+ else
5701
+ this.__remove(child, destroy);
5619
5702
  }
5620
5703
  else if (child === undefined) {
5621
5704
  super.remove(null, destroy);
@@ -5637,6 +5720,18 @@ let Branch = class Branch extends Leaf {
5637
5720
  clear() {
5638
5721
  this.removeAll(true);
5639
5722
  }
5723
+ __remove(child, destroy) {
5724
+ const index = this.children.indexOf(child);
5725
+ if (index > -1) {
5726
+ this.children.splice(index, 1);
5727
+ if (child.isBranch)
5728
+ this.__.__childBranchNumber = (this.__.__childBranchNumber || 1) - 1;
5729
+ this.__preRemove();
5730
+ this.__realRemoveChild(child);
5731
+ if (destroy)
5732
+ child.destroy();
5733
+ }
5734
+ }
5640
5735
  __preRemove() {
5641
5736
  if (this.__hasMask)
5642
5737
  this.__updateMask();
@@ -5646,6 +5741,7 @@ let Branch = class Branch extends Leaf {
5646
5741
  this.__layout.affectChildrenSort && this.__layout.childrenSortChange();
5647
5742
  }
5648
5743
  __realRemoveChild(child) {
5744
+ child.__emitLifeEvent(ChildEvent.REMOVE);
5649
5745
  child.parent = null;
5650
5746
  if (this.leafer) {
5651
5747
  child.__bindLeafer(null);
@@ -5658,8 +5754,6 @@ let Branch = class Branch extends Leaf {
5658
5754
  }
5659
5755
  __emitChildEvent(type, child) {
5660
5756
  const event = new ChildEvent(type, child, this);
5661
- if (child.hasEvent(type))
5662
- child.emitEvent(event);
5663
5757
  if (this.hasEvent(type) && !this.isLeafer)
5664
5758
  this.emitEvent(event);
5665
5759
  this.leafer.emitEvent(event);
@@ -5822,8 +5916,7 @@ class LeafLevelList {
5822
5916
  }
5823
5917
  }
5824
5918
 
5825
- const version = "1.0.1";
5826
- const inviteCode = {};
5919
+ const version = "1.0.4";
5827
5920
 
5828
5921
  class LeaferCanvas extends LeaferCanvasBase {
5829
5922
  get allowBackgroundColor() { return false; }
@@ -6187,9 +6280,13 @@ function updateBounds(boundsList) {
6187
6280
  });
6188
6281
  }
6189
6282
  function updateChange(updateList) {
6283
+ let layout;
6190
6284
  updateList.list.forEach(leaf => {
6191
- if (leaf.__layout.opacityChanged)
6285
+ layout = leaf.__layout;
6286
+ if (layout.opacityChanged)
6192
6287
  updateAllWorldOpacity(leaf);
6288
+ if (layout.stateStyleChanged)
6289
+ setTimeout(() => layout.stateStyleChanged && leaf.updateState());
6193
6290
  leaf.__updateChange();
6194
6291
  });
6195
6292
  }
@@ -6555,7 +6652,6 @@ class Renderer {
6555
6652
  Platform.requestRender(() => {
6556
6653
  this.FPS = Math.min(60, Math.ceil(1000 / (Date.now() - startTime)));
6557
6654
  if (this.running) {
6558
- this.target.emit(AnimateEvent.FRAME);
6559
6655
  if (this.changed && this.canvas.view)
6560
6656
  this.render();
6561
6657
  this.target.emit(RenderEvent.NEXT);
@@ -6629,36 +6725,6 @@ Object.assign(Creator, {
6629
6725
  });
6630
6726
  Platform.layout = Layouter.fullLayout;
6631
6727
 
6632
- const TextConvert = {};
6633
- const ColorConvert = {};
6634
- const PathArrow = {};
6635
- const Paint = {};
6636
- const PaintImage = {};
6637
- const PaintGradient = {};
6638
- const Effect = {};
6639
- const Export = {};
6640
- const State = {};
6641
-
6642
- function stateType(defaultValue) {
6643
- return decorateLeafAttr(defaultValue, (key) => attr({
6644
- set(value) {
6645
- this.__setAttr(key, value);
6646
- this.waitLeafer(() => { if (State.setStyle)
6647
- State.setStyle(this, key + 'Style', value); });
6648
- }
6649
- }));
6650
- }
6651
- function arrowType(defaultValue) {
6652
- return decorateLeafAttr(defaultValue, (key) => attr({
6653
- set(value) {
6654
- if (this.__setAttr(key, value)) {
6655
- const data = this.__;
6656
- data.__useArrow = data.startArrow !== 'none' || data.endArrow !== 'none';
6657
- doStrokeType(this);
6658
- }
6659
- }
6660
- }));
6661
- }
6662
6728
  function effectType(defaultValue) {
6663
6729
  return decorateLeafAttr(defaultValue, (key) => attr({
6664
6730
  set(value) {
@@ -6693,10 +6759,33 @@ function zoomLayerType() {
6693
6759
  };
6694
6760
  }
6695
6761
 
6762
+ const TextConvert = {};
6763
+ const ColorConvert = {};
6764
+ const PathArrow = {};
6765
+ const Paint = {};
6766
+ const PaintImage = {};
6767
+ const PaintGradient = {};
6768
+ const Effect = {};
6769
+ const Export = {};
6770
+ const State = {
6771
+ setStyleName(_leaf, _styleName, _value) { return needPlugin('state'); },
6772
+ set(_leaf, _stateName) { return needPlugin('state'); }
6773
+ };
6774
+ const Transition = {
6775
+ list: {},
6776
+ register(attrName, fn) {
6777
+ Transition.list[attrName] = fn;
6778
+ },
6779
+ get(attrName) {
6780
+ return Transition.list[attrName];
6781
+ }
6782
+ };
6783
+
6696
6784
  const { parse } = PathConvert;
6697
6785
  const emptyPaint = {};
6698
6786
  const debug$2 = Debug.get('UIData');
6699
6787
  class UIData extends LeafData {
6788
+ get scale() { const { scaleX, scaleY } = this; return scaleX !== scaleY ? { x: scaleX, y: scaleY } : scaleX; }
6700
6789
  get __strokeWidth() {
6701
6790
  const { strokeWidth, strokeWidthFixed } = this;
6702
6791
  if (strokeWidthFixed) {
@@ -6715,9 +6804,10 @@ class UIData extends LeafData {
6715
6804
  get __autoSide() { return !this._width || !this._height; }
6716
6805
  get __autoSize() { return !this._width && !this._height; }
6717
6806
  setVisible(value) {
6718
- if (this.__leaf.leafer)
6719
- this.__leaf.leafer.watcher.hasVisible = true;
6720
6807
  this._visible = value;
6808
+ const { leafer } = this.__leaf;
6809
+ if (leafer)
6810
+ leafer.watcher.hasVisible = true;
6721
6811
  }
6722
6812
  setWidth(value) {
6723
6813
  if (value < 0) {
@@ -6908,7 +6998,7 @@ class ImageData extends RectData {
6908
6998
  __setImageFill(value) {
6909
6999
  if (this.__leaf.image)
6910
7000
  this.__leaf.image = null;
6911
- this.fill = value ? { type: 'image', mode: 'strench', url: value } : undefined;
7001
+ this.fill = value ? { type: 'image', mode: 'stretch', url: value } : undefined;
6912
7002
  }
6913
7003
  __getData() {
6914
7004
  const data = super.__getData();
@@ -7098,19 +7188,8 @@ var UI_1;
7098
7188
  let UI = UI_1 = class UI extends Leaf {
7099
7189
  get app() { return this.leafer && this.leafer.app; }
7100
7190
  get isFrame() { return false; }
7101
- set scale(value) {
7102
- if (typeof value === 'number') {
7103
- this.scaleX = this.scaleY = value;
7104
- }
7105
- else {
7106
- this.scaleX = value.x;
7107
- this.scaleY = value.y;
7108
- }
7109
- }
7110
- get scale() {
7111
- const { scaleX, scaleY } = this;
7112
- return scaleX !== scaleY ? { x: scaleX, y: scaleY } : scaleX;
7113
- }
7191
+ set scale(value) { MathHelper.assignScale(this, value); }
7192
+ get scale() { return this.__.scale; }
7114
7193
  get pen() {
7115
7194
  const { path } = this.__;
7116
7195
  pen.set(this.path = path || []);
@@ -7125,8 +7204,15 @@ let UI = UI_1 = class UI extends Leaf {
7125
7204
  super(data);
7126
7205
  }
7127
7206
  reset(_data) { }
7128
- set(data) {
7129
- Object.assign(this, data);
7207
+ set(data, isTemp) {
7208
+ if (isTemp) {
7209
+ this.lockNormalStyle = true;
7210
+ Object.assign(this, data);
7211
+ this.lockNormalStyle = false;
7212
+ }
7213
+ else {
7214
+ Object.assign(this, data);
7215
+ }
7130
7216
  }
7131
7217
  get(name) {
7132
7218
  return typeof name === 'string' ? this.__.__getInput(name) : this.__.__getInputData(name);
@@ -7189,11 +7275,18 @@ let UI = UI_1 = class UI extends Leaf {
7189
7275
  drawer.rect(x, y, width, height);
7190
7276
  }
7191
7277
  }
7278
+ animate(_keyframe, _options, _type, _isTemp) {
7279
+ return needPlugin('animate');
7280
+ }
7281
+ killAnimate(_type) { }
7192
7282
  export(filename, options) {
7193
7283
  return Export.export(this, filename, options);
7194
7284
  }
7195
- clone() {
7196
- return UI_1.one(this.toJSON());
7285
+ clone(data) {
7286
+ const json = this.toJSON();
7287
+ if (data)
7288
+ Object.assign(json, data);
7289
+ return UI_1.one(json);
7197
7290
  }
7198
7291
  static one(data, x, y, width, height) {
7199
7292
  return UICreator.get(data.tag || this.prototype.__tag, data, x, y, width, height);
@@ -7209,6 +7302,8 @@ let UI = UI_1 = class UI extends Leaf {
7209
7302
  static setEditInner(_editorName) { }
7210
7303
  destroy() {
7211
7304
  this.fill = this.stroke = null;
7305
+ if (this.__animate)
7306
+ this.killAnimate();
7212
7307
  super.destroy();
7213
7308
  }
7214
7309
  };
@@ -7236,12 +7331,6 @@ __decorate([
7236
7331
  __decorate([
7237
7332
  visibleType(true)
7238
7333
  ], UI.prototype, "visible", void 0);
7239
- __decorate([
7240
- stateType(false)
7241
- ], UI.prototype, "selected", void 0);
7242
- __decorate([
7243
- stateType(false)
7244
- ], UI.prototype, "disabled", void 0);
7245
7334
  __decorate([
7246
7335
  surfaceType(false)
7247
7336
  ], UI.prototype, "locked", void 0);
@@ -7314,45 +7403,9 @@ __decorate([
7314
7403
  __decorate([
7315
7404
  pathType(true)
7316
7405
  ], UI.prototype, "closed", void 0);
7317
- __decorate([
7318
- autoLayoutType(false)
7319
- ], UI.prototype, "flow", void 0);
7320
7406
  __decorate([
7321
7407
  boundsType(0)
7322
7408
  ], UI.prototype, "padding", void 0);
7323
- __decorate([
7324
- boundsType(0)
7325
- ], UI.prototype, "gap", void 0);
7326
- __decorate([
7327
- boundsType('top-left')
7328
- ], UI.prototype, "flowAlign", void 0);
7329
- __decorate([
7330
- boundsType(false)
7331
- ], UI.prototype, "flowWrap", void 0);
7332
- __decorate([
7333
- boundsType('box')
7334
- ], UI.prototype, "itemBox", void 0);
7335
- __decorate([
7336
- boundsType(true)
7337
- ], UI.prototype, "inFlow", void 0);
7338
- __decorate([
7339
- boundsType()
7340
- ], UI.prototype, "autoWidth", void 0);
7341
- __decorate([
7342
- boundsType()
7343
- ], UI.prototype, "autoHeight", void 0);
7344
- __decorate([
7345
- boundsType()
7346
- ], UI.prototype, "lockRatio", void 0);
7347
- __decorate([
7348
- boundsType()
7349
- ], UI.prototype, "autoBox", void 0);
7350
- __decorate([
7351
- boundsType()
7352
- ], UI.prototype, "widthRange", void 0);
7353
- __decorate([
7354
- boundsType()
7355
- ], UI.prototype, "heightRange", void 0);
7356
7409
  __decorate([
7357
7410
  dataType(false)
7358
7411
  ], UI.prototype, "draggable", void 0);
@@ -7416,12 +7469,6 @@ __decorate([
7416
7469
  __decorate([
7417
7470
  strokeType(10)
7418
7471
  ], UI.prototype, "miterLimit", void 0);
7419
- __decorate([
7420
- arrowType('none')
7421
- ], UI.prototype, "startArrow", void 0);
7422
- __decorate([
7423
- arrowType('none')
7424
- ], UI.prototype, "endArrow", void 0);
7425
7472
  __decorate([
7426
7473
  pathType(0)
7427
7474
  ], UI.prototype, "cornerRadius", void 0);
@@ -7443,24 +7490,6 @@ __decorate([
7443
7490
  __decorate([
7444
7491
  effectType()
7445
7492
  ], UI.prototype, "grayscale", void 0);
7446
- __decorate([
7447
- dataType()
7448
- ], UI.prototype, "normalStyle", void 0);
7449
- __decorate([
7450
- dataType()
7451
- ], UI.prototype, "hoverStyle", void 0);
7452
- __decorate([
7453
- dataType()
7454
- ], UI.prototype, "pressStyle", void 0);
7455
- __decorate([
7456
- dataType()
7457
- ], UI.prototype, "focusStyle", void 0);
7458
- __decorate([
7459
- dataType()
7460
- ], UI.prototype, "selectedStyle", void 0);
7461
- __decorate([
7462
- dataType()
7463
- ], UI.prototype, "disabledStyle", void 0);
7464
7493
  __decorate([
7465
7494
  dataType({})
7466
7495
  ], UI.prototype, "data", void 0);
@@ -7487,7 +7516,7 @@ let Group = class Group extends UI {
7487
7516
  if (!this.children)
7488
7517
  this.children = [];
7489
7518
  }
7490
- set(data) {
7519
+ set(data, isTemp) {
7491
7520
  if (data.children) {
7492
7521
  const { children } = data;
7493
7522
  delete data.children;
@@ -7497,7 +7526,7 @@ let Group = class Group extends UI {
7497
7526
  else {
7498
7527
  this.clear();
7499
7528
  }
7500
- super.set(data);
7529
+ super.set(data, isTemp);
7501
7530
  let child;
7502
7531
  children.forEach(childData => {
7503
7532
  child = childData.__ ? childData : UICreator.get(childData.tag, childData);
@@ -7506,7 +7535,7 @@ let Group = class Group extends UI {
7506
7535
  data.children = children;
7507
7536
  }
7508
7537
  else {
7509
- super.set(data);
7538
+ super.set(data, isTemp);
7510
7539
  }
7511
7540
  }
7512
7541
  toJSON(options) {
@@ -7833,7 +7862,7 @@ let Leafer = Leafer_1 = class Leafer extends Group {
7833
7862
  }
7834
7863
  }
7835
7864
  zoom(_zoomType, _padding, _fixedScale) {
7836
- return debug$1.error('need @leafer-in/view');
7865
+ return needPlugin('view');
7837
7866
  }
7838
7867
  getValidMove(moveX, moveY) { return { x: moveX, y: moveY }; }
7839
7868
  getValidScale(changeScale) { return changeScale; }
@@ -8356,19 +8385,18 @@ let Canvas = class Canvas extends Rect {
8356
8385
  this.paint();
8357
8386
  }
8358
8387
  paint() {
8359
- this.forceUpdate('fill');
8388
+ this.forceRender();
8360
8389
  }
8361
8390
  __drawAfterFill(canvas, _options) {
8362
- const origin = this.canvas.view;
8363
- const { width, height } = this;
8364
- if (this.__.cornerRadius || this.pathInputed) {
8391
+ const { width, height, cornerRadius } = this.__, { view } = this.canvas;
8392
+ if (cornerRadius || this.pathInputed) {
8365
8393
  canvas.save();
8366
8394
  canvas.clip();
8367
- canvas.drawImage(this.canvas.view, 0, 0, origin.width, origin.height, 0, 0, width, height);
8395
+ canvas.drawImage(view, 0, 0, view.width, view.height, 0, 0, width, height);
8368
8396
  canvas.restore();
8369
8397
  }
8370
8398
  else {
8371
- canvas.drawImage(this.canvas.view, 0, 0, origin.width, origin.height, 0, 0, width, height);
8399
+ canvas.drawImage(view, 0, 0, view.width, view.height, 0, 0, width, height);
8372
8400
  }
8373
8401
  }
8374
8402
  __updateSize() {
@@ -9007,6 +9035,8 @@ function getPatternData(paint, box, image) {
9007
9035
  let { width, height } = image;
9008
9036
  if (paint.padding)
9009
9037
  box = tempBox.set(box).shrink(paint.padding);
9038
+ if (paint.mode === 'strench')
9039
+ paint.mode = 'stretch';
9010
9040
  const { opacity, mode, align, offset, scale, size, rotation, repeat } = paint;
9011
9041
  const sameBox = box.width === width && box.height === height;
9012
9042
  const data = { mode };
@@ -9035,7 +9065,7 @@ function getPatternData(paint, box, image) {
9035
9065
  if (offset)
9036
9066
  x += offset.x, y += offset.y;
9037
9067
  switch (mode) {
9038
- case 'strench':
9068
+ case 'stretch':
9039
9069
  if (!sameBox)
9040
9070
  width = box.width, height = box.height;
9041
9071
  break;
@@ -9062,7 +9092,7 @@ function getPatternData(paint, box, image) {
9062
9092
  translate(data.transform, box.x, box.y);
9063
9093
  }
9064
9094
  }
9065
- if (scaleX && mode !== 'strench') {
9095
+ if (scaleX && mode !== 'stretch') {
9066
9096
  data.scaleX = scaleX;
9067
9097
  data.scaleY = scaleY;
9068
9098
  }
@@ -9166,7 +9196,7 @@ const { get: get$1, scale, copy: copy$1 } = MatrixHelper;
9166
9196
  const { ceil, abs: abs$1 } = Math;
9167
9197
  function createPattern(ui, paint, pixelRatio) {
9168
9198
  let { scaleX, scaleY } = ImageManager.patternLocked ? ui.__world : ui.__nowWorld;
9169
- const id = scaleX + '-' + scaleY;
9199
+ const id = scaleX + '-' + scaleY + '-' + pixelRatio;
9170
9200
  if (paint.patternId !== id && !ui.destroyed) {
9171
9201
  scaleX = abs$1(scaleX);
9172
9202
  scaleY = abs$1(scaleY);
@@ -9228,7 +9258,8 @@ function createPattern(ui, paint, pixelRatio) {
9228
9258
  const { abs } = Math;
9229
9259
  function checkImage(ui, canvas, paint, allowPaint) {
9230
9260
  const { scaleX, scaleY } = ImageManager.patternLocked ? ui.__world : ui.__nowWorld;
9231
- if (!paint.data || (paint.patternId === scaleX + '-' + scaleY && !Export.running)) {
9261
+ const { pixelRatio } = canvas;
9262
+ if (!paint.data || (paint.patternId === scaleX + '-' + scaleY + '-' + pixelRatio && !Export.running)) {
9232
9263
  return false;
9233
9264
  }
9234
9265
  else {
@@ -9236,8 +9267,8 @@ function checkImage(ui, canvas, paint, allowPaint) {
9236
9267
  if (allowPaint) {
9237
9268
  if (!data.repeat) {
9238
9269
  let { width, height } = data;
9239
- width *= abs(scaleX) * canvas.pixelRatio;
9240
- height *= abs(scaleY) * canvas.pixelRatio;
9270
+ width *= abs(scaleX) * pixelRatio;
9271
+ height *= abs(scaleY) * pixelRatio;
9241
9272
  if (data.scaleX) {
9242
9273
  width *= data.scaleX;
9243
9274
  height *= data.scaleY;
@@ -9263,14 +9294,14 @@ function checkImage(ui, canvas, paint, allowPaint) {
9263
9294
  }
9264
9295
  else {
9265
9296
  if (!paint.style || paint.sync || Export.running) {
9266
- createPattern(ui, paint, canvas.pixelRatio);
9297
+ createPattern(ui, paint, pixelRatio);
9267
9298
  }
9268
9299
  else {
9269
9300
  if (!paint.patternTask) {
9270
9301
  paint.patternTask = ImageManager.patternTasker.add(() => __awaiter(this, void 0, void 0, function* () {
9271
9302
  paint.patternTask = null;
9272
9303
  if (canvas.bounds.hit(ui.__nowWorld))
9273
- createPattern(ui, paint, canvas.pixelRatio);
9304
+ createPattern(ui, paint, pixelRatio);
9274
9305
  ui.forceUpdate('surface');
9275
9306
  }), 300);
9276
9307
  }
@@ -9334,14 +9365,16 @@ function linearGradient(paint, box) {
9334
9365
  return data;
9335
9366
  }
9336
9367
  function applyStops(gradient, stops, opacity) {
9337
- let stop;
9338
- for (let i = 0, len = stops.length; i < len; i++) {
9339
- stop = stops[i];
9340
- if (typeof stop === 'string') {
9341
- gradient.addColorStop(i / (len - 1), ColorConvert.string(stop, opacity));
9342
- }
9343
- else {
9344
- gradient.addColorStop(stop.offset, ColorConvert.string(stop.color, opacity));
9368
+ if (stops) {
9369
+ let stop;
9370
+ for (let i = 0, len = stops.length; i < len; i++) {
9371
+ stop = stops[i];
9372
+ if (typeof stop === 'string') {
9373
+ gradient.addColorStop(i / (len - 1), ColorConvert.string(stop, opacity));
9374
+ }
9375
+ else {
9376
+ gradient.addColorStop(stop.offset, ColorConvert.string(stop.color, opacity));
9377
+ }
9345
9378
  }
9346
9379
  }
9347
9380
  }
@@ -10097,10 +10130,15 @@ const TextConvertModule = {
10097
10130
  };
10098
10131
 
10099
10132
  function string(color, opacity) {
10100
- if (typeof color === 'string')
10101
- return color;
10133
+ const doOpacity = typeof opacity === 'number' && opacity !== 1;
10134
+ if (typeof color === 'string') {
10135
+ if (doOpacity && ColorConvert.object)
10136
+ color = ColorConvert.object(color);
10137
+ else
10138
+ return color;
10139
+ }
10102
10140
  let a = color.a === undefined ? 1 : color.a;
10103
- if (opacity)
10141
+ if (doOpacity)
10104
10142
  a *= opacity;
10105
10143
  const rgb = color.r + ',' + color.g + ',' + color.b;
10106
10144
  return a === 1 ? 'rgb(' + rgb + ')' : 'rgba(' + rgb + ',' + a + ')';
@@ -10311,4 +10349,4 @@ try {
10311
10349
  }
10312
10350
  catch (_a) { }
10313
10351
 
10314
- export { AlignHelper, AnimateEvent, Answer, AroundHelper, AutoBounds, BezierHelper, Bounds, BoundsHelper, Box, BoxData, Branch, BranchHelper, BranchRender, Canvas, CanvasData, CanvasManager, ChildEvent, ColorConvert, Creator, DataHelper, Debug, Direction4, Direction9, Effect, Ellipse, EllipseData, EllipseHelper, Event, EventCreator, Export, FileHelper, Frame, FrameData, Group, GroupData, Image, ImageData, ImageEvent, ImageManager, IncrementId, LayoutEvent, Layouter, Leaf, LeafBounds, LeafBoundsHelper, LeafData, LeafDataProxy, LeafEventer, LeafHelper, LeafLayout, LeafLevelList, LeafList, LeafMatrix, LeafRender, Leafer, LeaferCanvas, LeaferCanvasBase, LeaferData, LeaferEvent, LeaferImage, Line, LineData, MathHelper, Matrix, MatrixHelper, MyImage, NeedConvertToCanvasCommandMap, OneRadian, PI2, PI_2, Paint, PaintGradient, PaintImage, Path, PathArrow, PathBounds, PathCommandDataHelper, PathCommandMap, PathConvert, PathCorner, PathCreator, PathData, PathDrawer, PathHelper, PathNumberCommandLengthMap, PathNumberCommandMap, Pen, PenData, Platform, Point, PointHelper, Polygon, PolygonData, PropertyEvent, Rect, RectData, RectHelper, RectRender, RenderEvent, Renderer, ResizeEvent, Run, Star, StarData, State, StringNumberMap, TaskItem, TaskProcessor, Text, TextConvert, TextData, TwoPointBoundsHelper, UI, UIBounds, UICreator, UIData, UIRender, UnitConvert, WaitHelper, WatchEvent, Watcher, affectRenderBoundsType, affectStrokeBoundsType, arrowType, attr, autoLayoutType, boundsType, canvasPatch, canvasSizeAttrs, cursorType, dataProcessor, dataType, decorateLeafAttr, defineDataProcessor, defineKey, defineLeafAttr, doBoundsType, doStrokeType, effectType, emptyData, eraserType, getBoundsData, getDescriptor, getMatrixData, getPointData, hitType, inviteCode, layoutProcessor, maskType, naturalBoundsType, opacityType, pathInputType, pathType, pen, positionType, registerUI, registerUIEvent, resizeType, rewrite, rewriteAble, rotationType, scaleType, sortType, stateType, strokeType, surfaceType, tempBounds$1 as tempBounds, tempMatrix, tempPoint$3 as tempPoint, useCanvas, useModule, version, visibleType, zoomLayerType };
10352
+ export { AlignHelper, Answer, AroundHelper, AutoBounds, BezierHelper, Bounds, BoundsHelper, Box, BoxData, Branch, BranchHelper, BranchRender, Canvas, CanvasData, CanvasManager, ChildEvent, ColorConvert, Creator, DataHelper, Debug, Direction4, Direction9, Effect, Ellipse, EllipseData, EllipseHelper, Event, EventCreator, Eventer, Export, FileHelper, Frame, FrameData, Group, GroupData, Image, ImageData, ImageEvent, ImageManager, IncrementId, LayoutEvent, Layouter, Leaf, LeafBounds, LeafBoundsHelper, LeafData, LeafDataProxy, LeafEventer, LeafHelper, LeafLayout, LeafLevelList, LeafList, LeafMatrix, LeafRender, Leafer, LeaferCanvas, LeaferCanvasBase, LeaferData, LeaferEvent, LeaferImage, Line, LineData, MathHelper, Matrix, MatrixHelper, MyImage, NeedConvertToCanvasCommandMap, OneRadian, PI2, PI_2, Paint, PaintGradient, PaintImage, Path, PathArrow, PathBounds, PathCommandDataHelper, PathCommandMap, PathConvert, PathCorner, PathCreator, PathData, PathDrawer, PathHelper, PathNumberCommandLengthMap, PathNumberCommandMap, Pen, PenData, Platform, Point, PointHelper, Polygon, PolygonData, PropertyEvent, Rect, RectData, RectHelper, RectRender, RenderEvent, Renderer, ResizeEvent, Run, Star, StarData, State, StringNumberMap, TaskItem, TaskProcessor, Text, TextConvert, TextData, Transition, TwoPointBoundsHelper, UI, UIBounds, UICreator, UIData, UIRender, UnitConvert, WaitHelper, WatchEvent, Watcher, affectRenderBoundsType, affectStrokeBoundsType, attr, autoLayoutType, boundsType, canvasPatch, canvasSizeAttrs, cursorType, dataProcessor, dataType, decorateLeafAttr, defineDataProcessor, defineKey, defineLeafAttr, doBoundsType, doStrokeType, effectType, emptyData, eraserType, getBoundsData, getDescriptor, getMatrixData, getPointData, hitType, isNull, layoutProcessor, maskType, naturalBoundsType, needPlugin, opacityType, pathInputType, pathType, pen, positionType, registerUI, registerUIEvent, resizeType, rewrite, rewriteAble, rotationType, scaleType, sortType, strokeType, surfaceType, tempBounds$1 as tempBounds, tempMatrix, tempPoint$3 as tempPoint, useCanvas, useModule, version, visibleType, zoomLayerType };