leafer-draw 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.
package/dist/web.js CHANGED
@@ -122,11 +122,18 @@ var LeaferUI = (function (exports) {
122
122
  scaleData.scaleX = (typeof size === 'number' ? size : size.width) / originSize.width;
123
123
  scaleData.scaleY = (typeof size === 'number' ? size : size.height) / originSize.height;
124
124
  }
125
- else if (scale) {
126
- scaleData.scaleX = typeof scale === 'number' ? scale : scale.x;
127
- scaleData.scaleY = typeof scale === 'number' ? scale : scale.y;
128
- }
125
+ else if (scale)
126
+ MathHelper.assignScale(scaleData, scale);
129
127
  return scaleData;
128
+ },
129
+ assignScale(scaleData, scale) {
130
+ if (typeof scale === 'number') {
131
+ scaleData.scaleX = scaleData.scaleY = scale;
132
+ }
133
+ else {
134
+ scaleData.scaleX = scale.x;
135
+ scaleData.scaleY = scale.y;
136
+ }
130
137
  }
131
138
  };
132
139
  const OneRadian = PI$4 / 180;
@@ -1258,7 +1265,6 @@ var LeaferUI = (function (exports) {
1258
1265
  tempPoint: {},
1259
1266
  get: get$4,
1260
1267
  toPoint(around, bounds, to, onlySize, pointBounds) {
1261
- to || (to = {});
1262
1268
  const point = get$4(around);
1263
1269
  to.x = point.x;
1264
1270
  to.y = point.y;
@@ -1393,6 +1399,10 @@ var LeaferUI = (function (exports) {
1393
1399
  };
1394
1400
  const R = Run;
1395
1401
 
1402
+ function needPlugin(name) {
1403
+ console.error('need plugin: @leafer-in/' + name);
1404
+ }
1405
+
1396
1406
  const debug$d = Debug.get('UICreator');
1397
1407
  const UICreator = {
1398
1408
  list: {},
@@ -1655,6 +1665,9 @@ var LeaferUI = (function (exports) {
1655
1665
  Answer[Answer["YesAndSkip"] = 3] = "YesAndSkip";
1656
1666
  })(exports.Answer || (exports.Answer = {}));
1657
1667
  const emptyData = {};
1668
+ function isNull(value) {
1669
+ return value === undefined || value === null;
1670
+ }
1658
1671
 
1659
1672
  /******************************************************************************
1660
1673
  Copyright (c) Microsoft Corporation.
@@ -2420,7 +2433,7 @@ var LeaferUI = (function (exports) {
2420
2433
  let startY = y = rotationSin * radiusX * startCos + rotationCos * radiusY * startSin;
2421
2434
  let fromX = cx + x, fromY = cy + y;
2422
2435
  if (data)
2423
- data.push(L$6, fromX, fromY);
2436
+ data.push(data.length ? L$6 : M$5, fromX, fromY);
2424
2437
  if (setPointBounds)
2425
2438
  setPoint$2(setPointBounds, fromX, fromY);
2426
2439
  if (setStartPoint)
@@ -3089,8 +3102,7 @@ var LeaferUI = (function (exports) {
3089
3102
  toTwoPointBounds(data, setPointBounds) {
3090
3103
  if (!data || !data.length)
3091
3104
  return setPoint$1(setPointBounds, 0, 0);
3092
- let command;
3093
- let i = 0, x = 0, y = 0, x1, y1, toX, toY;
3105
+ let i = 0, x = 0, y = 0, x1, y1, toX, toY, command;
3094
3106
  const len = data.length;
3095
3107
  while (i < len) {
3096
3108
  command = data[i];
@@ -3746,7 +3758,7 @@ var LeaferUI = (function (exports) {
3746
3758
  set(value) {
3747
3759
  if (this.__setAttr(key, value)) {
3748
3760
  this.__layout.matrixChanged || this.__layout.matrixChange();
3749
- this.__hasAutoLayout = !!value;
3761
+ this.__hasAutoLayout = !!(this.origin || this.around || this.flow);
3750
3762
  if (!this.__local)
3751
3763
  this.__layout.createLocal();
3752
3764
  }
@@ -3839,14 +3851,25 @@ var LeaferUI = (function (exports) {
3839
3851
  return decorateLeafAttr(defaultValue, (key) => attr({
3840
3852
  set(value) {
3841
3853
  const oldValue = this.visible;
3842
- if (this.__setAttr(key, value)) {
3843
- this.__layout.opacityChanged || this.__layout.opacityChange();
3844
- if (oldValue === 0 || value === 0)
3845
- doBoundsType(this);
3854
+ if (oldValue === true && value === 0) {
3855
+ if (this.animationOut)
3856
+ return this.__runAnimation('out', () => doVisible(this, key, value, oldValue));
3857
+ }
3858
+ else if (oldValue === 0 && value === true) {
3859
+ if (this.animation)
3860
+ this.__runAnimation('in');
3846
3861
  }
3862
+ doVisible(this, key, value, oldValue);
3847
3863
  }
3848
3864
  }));
3849
3865
  }
3866
+ function doVisible(leaf, key, value, oldValue) {
3867
+ if (leaf.__setAttr(key, value)) {
3868
+ leaf.__layout.opacityChanged || leaf.__layout.opacityChange();
3869
+ if (oldValue === 0 || value === 0)
3870
+ doBoundsType(leaf);
3871
+ }
3872
+ }
3850
3873
  function sortType(defaultValue) {
3851
3874
  return decorateLeafAttr(defaultValue, (key) => attr({
3852
3875
  set(value) {
@@ -3930,7 +3953,16 @@ var LeaferUI = (function (exports) {
3930
3953
  if (defaultValue === undefined) {
3931
3954
  property.get = function () { return this[computedKey]; };
3932
3955
  }
3933
- else if (key === 'width') {
3956
+ else if (typeof defaultValue === 'object') {
3957
+ const { clone } = DataHelper;
3958
+ property.get = function () {
3959
+ let v = this[computedKey];
3960
+ if (v === undefined)
3961
+ this[computedKey] = v = clone(defaultValue);
3962
+ return v;
3963
+ };
3964
+ }
3965
+ if (key === 'width') {
3934
3966
  property.get = function () {
3935
3967
  const v = this[computedKey];
3936
3968
  if (v === undefined) {
@@ -4454,15 +4486,16 @@ var LeaferUI = (function (exports) {
4454
4486
  }
4455
4487
  getLayoutBounds(type, relative = 'world', unscale) {
4456
4488
  const { leaf } = this;
4457
- let point, matrix, bounds = this.getInnerBounds(type);
4489
+ let point, matrix, layoutBounds, bounds = this.getInnerBounds(type);
4458
4490
  switch (relative) {
4459
4491
  case 'world':
4460
4492
  point = leaf.getWorldPoint(bounds);
4461
4493
  matrix = leaf.__world;
4462
4494
  break;
4463
4495
  case 'local':
4496
+ const { scaleX, scaleY, rotation, skewX, skewY } = leaf.__;
4497
+ layoutBounds = { scaleX, scaleY, rotation, skewX, skewY };
4464
4498
  point = leaf.getLocalPointByInner(bounds);
4465
- matrix = leaf.__localMatrix;
4466
4499
  break;
4467
4500
  case 'inner':
4468
4501
  point = bounds;
@@ -4474,7 +4507,8 @@ var LeaferUI = (function (exports) {
4474
4507
  point = leaf.getWorldPoint(bounds, relative);
4475
4508
  matrix = getRelativeWorld$1(leaf, relative, true);
4476
4509
  }
4477
- const layoutBounds = MatrixHelper.getLayout(matrix);
4510
+ if (!layoutBounds)
4511
+ layoutBounds = MatrixHelper.getLayout(matrix);
4478
4512
  copy$5(layoutBounds, bounds);
4479
4513
  PointHelper.copy(layoutBounds, point);
4480
4514
  if (unscale) {
@@ -4597,144 +4631,6 @@ var LeaferUI = (function (exports) {
4597
4631
  destroy() { }
4598
4632
  }
4599
4633
 
4600
- const empty = {};
4601
- const LeafEventer = {
4602
- on(type, listener, options) {
4603
- let capture, once;
4604
- if (options) {
4605
- if (options === 'once') {
4606
- once = true;
4607
- }
4608
- else if (typeof options === 'boolean') {
4609
- capture = options;
4610
- }
4611
- else {
4612
- capture = options.capture;
4613
- once = options.once;
4614
- }
4615
- }
4616
- let events;
4617
- const map = __getListenerMap(this, capture, true);
4618
- const typeList = typeof type === 'string' ? type.split(' ') : type;
4619
- const item = once ? { listener, once } : { listener };
4620
- typeList.forEach(type => {
4621
- if (type) {
4622
- events = map[type];
4623
- if (events) {
4624
- if (events.findIndex(item => item.listener === listener) === -1)
4625
- events.push(item);
4626
- }
4627
- else {
4628
- map[type] = [item];
4629
- }
4630
- }
4631
- });
4632
- },
4633
- off(type, listener, options) {
4634
- if (type) {
4635
- const typeList = typeof type === 'string' ? type.split(' ') : type;
4636
- if (listener) {
4637
- let capture;
4638
- if (options)
4639
- capture = typeof options === 'boolean' ? options : (options === 'once' ? false : options.capture);
4640
- let events, index;
4641
- const map = __getListenerMap(this, capture);
4642
- typeList.forEach(type => {
4643
- if (type) {
4644
- events = map[type];
4645
- if (events) {
4646
- index = events.findIndex(item => item.listener === listener);
4647
- if (index > -1)
4648
- events.splice(index, 1);
4649
- if (!events.length)
4650
- delete map[type];
4651
- }
4652
- }
4653
- });
4654
- }
4655
- else {
4656
- const { __bubbleMap: b, __captureMap: c } = this;
4657
- typeList.forEach(type => {
4658
- if (b)
4659
- delete b[type];
4660
- if (c)
4661
- delete c[type];
4662
- });
4663
- }
4664
- }
4665
- else {
4666
- this.__bubbleMap = this.__captureMap = undefined;
4667
- }
4668
- },
4669
- on_(type, listener, bind, options) {
4670
- if (bind)
4671
- listener = listener.bind(bind);
4672
- this.on(type, listener, options);
4673
- return { type, current: this, listener, options };
4674
- },
4675
- off_(id) {
4676
- if (!id)
4677
- return;
4678
- const list = id instanceof Array ? id : [id];
4679
- list.forEach(item => item.current.off(item.type, item.listener, item.options));
4680
- list.length = 0;
4681
- },
4682
- once(type, listener, capture) {
4683
- this.on(type, listener, { once: true, capture });
4684
- },
4685
- emit(type, event, capture) {
4686
- if (!event && EventCreator.has(type))
4687
- event = EventCreator.get(type, { type, target: this, current: this });
4688
- const map = __getListenerMap(this, capture);
4689
- const list = map[type];
4690
- if (list) {
4691
- let item;
4692
- for (let i = 0, len = list.length; i < len; i++) {
4693
- item = list[i];
4694
- item.listener(event);
4695
- if (item.once) {
4696
- this.off(type, item.listener, capture);
4697
- i--, len--;
4698
- }
4699
- if (event && event.isStopNow)
4700
- break;
4701
- }
4702
- }
4703
- this.syncEventer && this.syncEventer.emitEvent(event, capture);
4704
- },
4705
- emitEvent(event, capture) {
4706
- event.current = this;
4707
- this.emit(event.type, event, capture);
4708
- },
4709
- hasEvent(type, capture) {
4710
- if (this.syncEventer && this.syncEventer.hasEvent(type, capture))
4711
- return true;
4712
- const { __bubbleMap: b, __captureMap: c } = this;
4713
- const hasB = b && b[type], hasC = c && c[type];
4714
- return !!(capture === undefined ? (hasB || hasC) : (capture ? hasC : hasB));
4715
- },
4716
- };
4717
- function __getListenerMap(eventer, capture, create) {
4718
- if (capture) {
4719
- const { __captureMap: c } = eventer;
4720
- if (c) {
4721
- return c;
4722
- }
4723
- else {
4724
- return create ? eventer.__captureMap = {} : empty;
4725
- }
4726
- }
4727
- else {
4728
- const { __bubbleMap: b } = eventer;
4729
- if (b) {
4730
- return b;
4731
- }
4732
- else {
4733
- return create ? eventer.__bubbleMap = {} : empty;
4734
- }
4735
- }
4736
- }
4737
-
4738
4634
  class Event {
4739
4635
  constructor(type, target) {
4740
4636
  this.bubbles = false;
@@ -4769,7 +4665,10 @@ var LeaferUI = (function (exports) {
4769
4665
  }
4770
4666
  ChildEvent.ADD = 'child.add';
4771
4667
  ChildEvent.REMOVE = 'child.remove';
4772
- ChildEvent.DESTROY = 'child.destroy';
4668
+ ChildEvent.CREATED = 'created';
4669
+ ChildEvent.MOUNTED = 'mounted';
4670
+ ChildEvent.UNMOUNTED = 'unmounted';
4671
+ ChildEvent.DESTROY = 'destroy';
4773
4672
 
4774
4673
  class PropertyEvent extends Event {
4775
4674
  constructor(type, target, attrName, oldValue, newValue) {
@@ -4847,10 +4746,6 @@ var LeaferUI = (function (exports) {
4847
4746
  LayoutEvent.AGAIN = 'layout.again';
4848
4747
  LayoutEvent.END = 'layout.end';
4849
4748
 
4850
- class AnimateEvent extends Event {
4851
- }
4852
- AnimateEvent.FRAME = 'animate.frame';
4853
-
4854
4749
  class RenderEvent extends Event {
4855
4750
  constructor(type, times, bounds, options) {
4856
4751
  super(type);
@@ -4883,6 +4778,157 @@ var LeaferUI = (function (exports) {
4883
4778
  LeaferEvent.RESTART = 'leafer.restart';
4884
4779
  LeaferEvent.END = 'leafer.end';
4885
4780
 
4781
+ const empty = {};
4782
+ class Eventer {
4783
+ set event(map) { this.on(map); }
4784
+ on(type, listener, options) {
4785
+ if (!listener) {
4786
+ let event, map = type;
4787
+ for (let key in map)
4788
+ event = map[key], event instanceof Array ? this.on(key, event[0], event[1]) : this.on(key, event);
4789
+ return;
4790
+ }
4791
+ let capture, once;
4792
+ if (options) {
4793
+ if (options === 'once') {
4794
+ once = true;
4795
+ }
4796
+ else if (typeof options === 'boolean') {
4797
+ capture = options;
4798
+ }
4799
+ else {
4800
+ capture = options.capture;
4801
+ once = options.once;
4802
+ }
4803
+ }
4804
+ let events;
4805
+ const map = __getListenerMap(this, capture, true);
4806
+ const typeList = typeof type === 'string' ? type.split(' ') : type;
4807
+ const item = once ? { listener, once } : { listener };
4808
+ typeList.forEach(type => {
4809
+ if (type) {
4810
+ events = map[type];
4811
+ if (events) {
4812
+ if (events.findIndex(item => item.listener === listener) === -1)
4813
+ events.push(item);
4814
+ }
4815
+ else {
4816
+ map[type] = [item];
4817
+ }
4818
+ }
4819
+ });
4820
+ }
4821
+ off(type, listener, options) {
4822
+ if (type) {
4823
+ const typeList = typeof type === 'string' ? type.split(' ') : type;
4824
+ if (listener) {
4825
+ let capture;
4826
+ if (options)
4827
+ capture = typeof options === 'boolean' ? options : (options === 'once' ? false : options.capture);
4828
+ let events, index;
4829
+ const map = __getListenerMap(this, capture);
4830
+ typeList.forEach(type => {
4831
+ if (type) {
4832
+ events = map[type];
4833
+ if (events) {
4834
+ index = events.findIndex(item => item.listener === listener);
4835
+ if (index > -1)
4836
+ events.splice(index, 1);
4837
+ if (!events.length)
4838
+ delete map[type];
4839
+ }
4840
+ }
4841
+ });
4842
+ }
4843
+ else {
4844
+ const { __bubbleMap: b, __captureMap: c } = this;
4845
+ typeList.forEach(type => {
4846
+ if (b)
4847
+ delete b[type];
4848
+ if (c)
4849
+ delete c[type];
4850
+ });
4851
+ }
4852
+ }
4853
+ else {
4854
+ this.__bubbleMap = this.__captureMap = undefined;
4855
+ }
4856
+ }
4857
+ on_(type, listener, bind, options) {
4858
+ if (bind)
4859
+ listener = listener.bind(bind);
4860
+ this.on(type, listener, options);
4861
+ return { type, current: this, listener, options };
4862
+ }
4863
+ off_(id) {
4864
+ if (!id)
4865
+ return;
4866
+ const list = id instanceof Array ? id : [id];
4867
+ list.forEach(item => item.current.off(item.type, item.listener, item.options));
4868
+ list.length = 0;
4869
+ }
4870
+ once(type, listener, capture) {
4871
+ this.on(type, listener, { once: true, capture });
4872
+ }
4873
+ emit(type, event, capture) {
4874
+ if (!event && EventCreator.has(type))
4875
+ event = EventCreator.get(type, { type, target: this, current: this });
4876
+ const map = __getListenerMap(this, capture);
4877
+ const list = map[type];
4878
+ if (list) {
4879
+ let item;
4880
+ for (let i = 0, len = list.length; i < len; i++) {
4881
+ item = list[i];
4882
+ item.listener(event);
4883
+ if (item.once) {
4884
+ this.off(type, item.listener, capture);
4885
+ i--, len--;
4886
+ }
4887
+ if (event && event.isStopNow)
4888
+ break;
4889
+ }
4890
+ }
4891
+ this.syncEventer && this.syncEventer.emitEvent(event, capture);
4892
+ }
4893
+ emitEvent(event, capture) {
4894
+ event.current = this;
4895
+ this.emit(event.type, event, capture);
4896
+ }
4897
+ hasEvent(type, capture) {
4898
+ if (this.syncEventer && this.syncEventer.hasEvent(type, capture))
4899
+ return true;
4900
+ const { __bubbleMap: b, __captureMap: c } = this;
4901
+ const hasB = b && b[type], hasC = c && c[type];
4902
+ return !!(capture === undefined ? (hasB || hasC) : (capture ? hasC : hasB));
4903
+ }
4904
+ destroy() {
4905
+ this.__captureMap = this.__bubbleMap = this.syncEventer = null;
4906
+ }
4907
+ }
4908
+ function __getListenerMap(eventer, capture, create) {
4909
+ if (capture) {
4910
+ const { __captureMap: c } = eventer;
4911
+ if (c) {
4912
+ return c;
4913
+ }
4914
+ else {
4915
+ return create ? eventer.__captureMap = {} : empty;
4916
+ }
4917
+ }
4918
+ else {
4919
+ const { __bubbleMap: b } = eventer;
4920
+ if (b) {
4921
+ return b;
4922
+ }
4923
+ else {
4924
+ return create ? eventer.__bubbleMap = {} : empty;
4925
+ }
4926
+ }
4927
+ }
4928
+
4929
+ const { on, on_, off, off_, once, emit: emit$1, emitEvent, hasEvent, destroy } = Eventer.prototype;
4930
+ const LeafEventer = { on, on_, off, off_, once, emit: emit$1, emitEvent, hasEvent, destroyEventer: destroy };
4931
+
4886
4932
  const { isFinite } = Number;
4887
4933
  const debug$6 = Debug.get('setAttr');
4888
4934
  const LeafDataProxy = {
@@ -4894,9 +4940,7 @@ var LeaferUI = (function (exports) {
4894
4940
  newValue = undefined;
4895
4941
  }
4896
4942
  if (typeof newValue === 'object' || oldValue !== newValue) {
4897
- this.__[name] = newValue;
4898
- if (this.__proxyData)
4899
- this.setProxyAttr(name, newValue);
4943
+ this.__realSetAttr(name, newValue);
4900
4944
  const { CHANGE } = PropertyEvent;
4901
4945
  const event = new PropertyEvent(CHANGE, this, name, oldValue, newValue);
4902
4946
  if (this.isLeafer) {
@@ -4914,12 +4958,18 @@ var LeaferUI = (function (exports) {
4914
4958
  }
4915
4959
  }
4916
4960
  else {
4917
- this.__[name] = newValue;
4918
- if (this.__proxyData)
4919
- this.setProxyAttr(name, newValue);
4961
+ this.__realSetAttr(name, newValue);
4920
4962
  return true;
4921
4963
  }
4922
4964
  },
4965
+ __realSetAttr(name, newValue) {
4966
+ const data = this.__;
4967
+ data[name] = newValue;
4968
+ if (this.__proxyData)
4969
+ this.setProxyAttr(name, newValue);
4970
+ if (data.normalStyle)
4971
+ this.lockNormalStyle || data.normalStyle[name] === undefined || (data.normalStyle[name] = newValue);
4972
+ },
4923
4973
  __getAttr(name) {
4924
4974
  if (this.__proxyData)
4925
4975
  return this.getProxyAttr(name);
@@ -5022,6 +5072,8 @@ var LeaferUI = (function (exports) {
5022
5072
  layout.boundsChanged = false;
5023
5073
  },
5024
5074
  __updateLocalBoxBounds() {
5075
+ if (this.__hasMotionPath)
5076
+ this.__updateMotionPath();
5025
5077
  if (this.__hasAutoLayout)
5026
5078
  this.__updateAutoLayout();
5027
5079
  toOuterOf$1(this.__layout.boxBounds, this.__local, this.__local);
@@ -5174,7 +5226,7 @@ var LeaferUI = (function (exports) {
5174
5226
  const { LEAF, create } = IncrementId;
5175
5227
  const { toInnerPoint, toOuterPoint, multiplyParent } = MatrixHelper;
5176
5228
  const { toOuterOf } = BoundsHelper;
5177
- const { copy: copy$3 } = PointHelper;
5229
+ const { copy: copy$3, move } = PointHelper;
5178
5230
  const { moveLocal, zoomOfLocal, rotateOfLocal, skewOfLocal, moveWorld, zoomOfWorld, rotateOfWorld, skewOfWorld, transform, transformWorld, setTransform, getFlipTransform, getLocalOrigin, getRelativeWorld, drop } = LeafHelper;
5179
5231
  exports.Leaf = class Leaf {
5180
5232
  get tag() { return this.__tag; }
@@ -5201,13 +5253,16 @@ var LeaferUI = (function (exports) {
5201
5253
  get __ignoreHitWorld() { return (this.__hasMask || this.__hasEraser) && this.__.hitChildren; }
5202
5254
  get __inLazyBounds() { const { leafer } = this; return leafer && leafer.created && leafer.lazyBounds.hit(this.__world); }
5203
5255
  get pathInputed() { return this.__.__pathInputed; }
5204
- set event(map) { let event; for (let key in map)
5205
- event = map[key], event instanceof Array ? this.on(key, event[0], event[1]) : this.on(key, event); }
5256
+ set event(map) { this.on(map); }
5206
5257
  constructor(data) {
5207
5258
  this.innerId = create(LEAF);
5208
5259
  this.reset(data);
5260
+ if (this.__bubbleMap)
5261
+ this.__emitLifeEvent(ChildEvent.CREATED);
5209
5262
  }
5210
5263
  reset(data) {
5264
+ if (this.leafer)
5265
+ this.leafer.forceRender(this.__world);
5211
5266
  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 };
5212
5267
  if (data !== null)
5213
5268
  this.__local = { a: 1, b: 0, c: 0, d: 1, e: 0, f: 0, x: 0, y: 0, width: 0, height: 0 };
@@ -5229,12 +5284,12 @@ var LeaferUI = (function (exports) {
5229
5284
  waitParent(item, bind) {
5230
5285
  if (bind)
5231
5286
  item = item.bind(bind);
5232
- this.parent ? item() : (this.__parentWait ? this.__parentWait.push(item) : this.__parentWait = [item]);
5287
+ this.parent ? item() : this.on(ChildEvent.ADD, item, 'once');
5233
5288
  }
5234
5289
  waitLeafer(item, bind) {
5235
5290
  if (bind)
5236
5291
  item = item.bind(bind);
5237
- this.leafer ? item() : (this.__leaferWait ? this.__leaferWait.push(item) : this.__leaferWait = [item]);
5292
+ this.leafer ? item() : this.on(ChildEvent.MOUNTED, item, 'once');
5238
5293
  }
5239
5294
  nextRender(item, bind, off) {
5240
5295
  this.leafer ? this.leafer.nextRender(item, bind, off) : this.waitLeafer(() => this.leafer.nextRender(item, bind, off));
@@ -5243,18 +5298,21 @@ var LeaferUI = (function (exports) {
5243
5298
  this.nextRender(item, null, 'off');
5244
5299
  }
5245
5300
  __bindLeafer(leafer) {
5246
- if (this.isLeafer) {
5247
- if (leafer !== null)
5248
- leafer = this;
5249
- }
5301
+ if (this.isLeafer && leafer !== null)
5302
+ leafer = this;
5250
5303
  if (this.leafer && !leafer)
5251
5304
  this.leafer.leafs--;
5252
5305
  this.leafer = leafer;
5253
5306
  if (leafer) {
5254
5307
  leafer.leafs++;
5255
5308
  this.__level = this.parent ? this.parent.__level + 1 : 1;
5256
- if (this.__leaferWait)
5257
- WaitHelper.run(this.__leaferWait);
5309
+ if (this.animation)
5310
+ this.__runAnimation('in');
5311
+ if (this.__bubbleMap)
5312
+ this.__emitLifeEvent(ChildEvent.MOUNTED);
5313
+ }
5314
+ else {
5315
+ this.__emitLifeEvent(ChildEvent.UNMOUNTED);
5258
5316
  }
5259
5317
  if (this.isBranch) {
5260
5318
  const { children } = this;
@@ -5263,7 +5321,7 @@ var LeaferUI = (function (exports) {
5263
5321
  }
5264
5322
  }
5265
5323
  }
5266
- set(_data) { }
5324
+ set(_data, _isTemp) { }
5267
5325
  get(_name) { return undefined; }
5268
5326
  setAttr(name, value) { this[name] = value; }
5269
5327
  getAttr(name) { return this[name]; }
@@ -5288,6 +5346,7 @@ var LeaferUI = (function (exports) {
5288
5346
  findOne(_condition, _options) { return undefined; }
5289
5347
  findId(_id) { return undefined; }
5290
5348
  focus(_value) { }
5349
+ updateState() { }
5291
5350
  updateLayout() {
5292
5351
  this.__layout.update();
5293
5352
  }
@@ -5395,11 +5454,24 @@ var LeaferUI = (function (exports) {
5395
5454
  if (relative)
5396
5455
  relative.worldToInner(to ? to : inner, null, distance);
5397
5456
  }
5457
+ getBoxPoint(world, relative, distance, change) {
5458
+ return this.getBoxPointByInner(this.getInnerPoint(world, relative, distance, change), null, null, true);
5459
+ }
5460
+ getBoxPointByInner(inner, _relative, _distance, change) {
5461
+ const point = change ? inner : Object.assign({}, inner), { x, y } = this.boxBounds;
5462
+ move(point, -x, -y);
5463
+ return point;
5464
+ }
5398
5465
  getInnerPoint(world, relative, distance, change) {
5399
5466
  const point = change ? world : {};
5400
5467
  this.worldToInner(world, point, distance, relative);
5401
5468
  return point;
5402
5469
  }
5470
+ getInnerPointByBox(box, _relative, _distance, change) {
5471
+ const point = change ? box : Object.assign({}, box), { x, y } = this.boxBounds;
5472
+ move(point, x, y);
5473
+ return point;
5474
+ }
5403
5475
  getInnerPointByLocal(local, _relative, distance, change) {
5404
5476
  return this.getInnerPoint(local, this.parent, distance, change);
5405
5477
  }
@@ -5411,20 +5483,23 @@ var LeaferUI = (function (exports) {
5411
5483
  getLocalPointByInner(inner, _relative, distance, change) {
5412
5484
  return this.getWorldPoint(inner, this.parent, distance, change);
5413
5485
  }
5486
+ getPagePoint(world, relative, distance, change) {
5487
+ const layer = this.leafer ? this.leafer.zoomLayer : this;
5488
+ return layer.getInnerPoint(world, relative, distance, change);
5489
+ }
5414
5490
  getWorldPoint(inner, relative, distance, change) {
5415
5491
  const point = change ? inner : {};
5416
5492
  this.innerToWorld(inner, point, distance, relative);
5417
5493
  return point;
5418
5494
  }
5495
+ getWorldPointByBox(box, relative, distance, change) {
5496
+ return this.getWorldPoint(this.getInnerPointByBox(box, null, null, change), relative, distance, true);
5497
+ }
5419
5498
  getWorldPointByLocal(local, relative, distance, change) {
5420
5499
  const point = change ? local : {};
5421
5500
  this.localToWorld(local, point, distance, relative);
5422
5501
  return point;
5423
5502
  }
5424
- getPagePoint(world, relative, distance, change) {
5425
- const layer = this.leafer ? this.leafer.zoomLayer : this;
5426
- return layer.getInnerPoint(world, relative, distance, change);
5427
- }
5428
5503
  getWorldPointByPage(page, relative, distance, change) {
5429
5504
  const layer = this.leafer ? this.leafer.zoomLayer : this;
5430
5505
  return layer.getWorldPoint(page, relative, distance, change);
@@ -5493,6 +5568,17 @@ var LeaferUI = (function (exports) {
5493
5568
  __drawRenderPath(_canvas) { }
5494
5569
  __updatePath() { }
5495
5570
  __updateRenderPath() { }
5571
+ getMotionPathData() {
5572
+ return needPlugin('path');
5573
+ }
5574
+ getMotionPoint(_motionDistance) {
5575
+ return needPlugin('path');
5576
+ }
5577
+ getMotionTotal() {
5578
+ return 0;
5579
+ }
5580
+ __updateMotionPath() { }
5581
+ __runAnimation(_type, _complete) { }
5496
5582
  __updateSortChildren() { }
5497
5583
  add(_child, _index) { }
5498
5584
  remove(_child, destroy) {
@@ -5518,6 +5604,10 @@ var LeaferUI = (function (exports) {
5518
5604
  fn = boundsType;
5519
5605
  fn(defaultValue)(this.prototype, attrName);
5520
5606
  }
5607
+ __emitLifeEvent(type) {
5608
+ if (this.hasEvent(type))
5609
+ this.emitEvent(new ChildEvent(type, this, this.parent));
5610
+ }
5521
5611
  destroy() {
5522
5612
  if (!this.destroyed) {
5523
5613
  const { parent } = this;
@@ -5525,11 +5615,10 @@ var LeaferUI = (function (exports) {
5525
5615
  this.remove();
5526
5616
  if (this.children)
5527
5617
  this.removeAll(true);
5528
- if (this.hasEvent(ChildEvent.DESTROY))
5529
- this.emitEvent(new ChildEvent(ChildEvent.DESTROY, this, parent));
5618
+ this.__emitLifeEvent(ChildEvent.DESTROY);
5530
5619
  this.__.destroy();
5531
5620
  this.__layout.destroy();
5532
- this.__captureMap = this.__bubbleMap = this.__parentWait = this.__leaferWait = null;
5621
+ this.destroyEventer();
5533
5622
  this.destroyed = true;
5534
5623
  }
5535
5624
  }
@@ -5595,8 +5684,8 @@ var LeaferUI = (function (exports) {
5595
5684
  this.__.__childBranchNumber = (this.__.__childBranchNumber || 0) + 1;
5596
5685
  child.__layout.boxChanged || child.__layout.boxChange();
5597
5686
  child.__layout.matrixChanged || child.__layout.matrixChange();
5598
- if (child.__parentWait)
5599
- WaitHelper.run(child.__parentWait);
5687
+ if (child.__bubbleMap)
5688
+ child.__emitLifeEvent(ChildEvent.ADD);
5600
5689
  if (this.leafer) {
5601
5690
  child.__bindLeafer(this.leafer);
5602
5691
  if (this.leafer.created)
@@ -5609,16 +5698,10 @@ var LeaferUI = (function (exports) {
5609
5698
  }
5610
5699
  remove(child, destroy) {
5611
5700
  if (child) {
5612
- const index = this.children.indexOf(child);
5613
- if (index > -1) {
5614
- this.children.splice(index, 1);
5615
- if (child.isBranch)
5616
- this.__.__childBranchNumber = (this.__.__childBranchNumber || 1) - 1;
5617
- this.__preRemove();
5618
- this.__realRemoveChild(child);
5619
- if (destroy)
5620
- child.destroy();
5621
- }
5701
+ if (child.animationOut)
5702
+ child.__runAnimation('out', () => this.__remove(child, destroy));
5703
+ else
5704
+ this.__remove(child, destroy);
5622
5705
  }
5623
5706
  else if (child === undefined) {
5624
5707
  super.remove(null, destroy);
@@ -5640,6 +5723,18 @@ var LeaferUI = (function (exports) {
5640
5723
  clear() {
5641
5724
  this.removeAll(true);
5642
5725
  }
5726
+ __remove(child, destroy) {
5727
+ const index = this.children.indexOf(child);
5728
+ if (index > -1) {
5729
+ this.children.splice(index, 1);
5730
+ if (child.isBranch)
5731
+ this.__.__childBranchNumber = (this.__.__childBranchNumber || 1) - 1;
5732
+ this.__preRemove();
5733
+ this.__realRemoveChild(child);
5734
+ if (destroy)
5735
+ child.destroy();
5736
+ }
5737
+ }
5643
5738
  __preRemove() {
5644
5739
  if (this.__hasMask)
5645
5740
  this.__updateMask();
@@ -5649,6 +5744,7 @@ var LeaferUI = (function (exports) {
5649
5744
  this.__layout.affectChildrenSort && this.__layout.childrenSortChange();
5650
5745
  }
5651
5746
  __realRemoveChild(child) {
5747
+ child.__emitLifeEvent(ChildEvent.REMOVE);
5652
5748
  child.parent = null;
5653
5749
  if (this.leafer) {
5654
5750
  child.__bindLeafer(null);
@@ -5661,8 +5757,6 @@ var LeaferUI = (function (exports) {
5661
5757
  }
5662
5758
  __emitChildEvent(type, child) {
5663
5759
  const event = new ChildEvent(type, child, this);
5664
- if (child.hasEvent(type))
5665
- child.emitEvent(event);
5666
5760
  if (this.hasEvent(type) && !this.isLeafer)
5667
5761
  this.emitEvent(event);
5668
5762
  this.leafer.emitEvent(event);
@@ -5825,8 +5919,7 @@ var LeaferUI = (function (exports) {
5825
5919
  }
5826
5920
  }
5827
5921
 
5828
- const version = "1.0.1";
5829
- const inviteCode = {};
5922
+ const version = "1.0.4";
5830
5923
 
5831
5924
  const debug$5 = Debug.get('LeaferCanvas');
5832
5925
  class LeaferCanvas extends LeaferCanvasBase {
@@ -6226,9 +6319,13 @@ var LeaferUI = (function (exports) {
6226
6319
  });
6227
6320
  }
6228
6321
  function updateChange(updateList) {
6322
+ let layout;
6229
6323
  updateList.list.forEach(leaf => {
6230
- if (leaf.__layout.opacityChanged)
6324
+ layout = leaf.__layout;
6325
+ if (layout.opacityChanged)
6231
6326
  updateAllWorldOpacity(leaf);
6327
+ if (layout.stateStyleChanged)
6328
+ setTimeout(() => layout.stateStyleChanged && leaf.updateState());
6232
6329
  leaf.__updateChange();
6233
6330
  });
6234
6331
  }
@@ -6594,7 +6691,6 @@ var LeaferUI = (function (exports) {
6594
6691
  Platform.requestRender(() => {
6595
6692
  this.FPS = Math.min(60, Math.ceil(1000 / (Date.now() - startTime)));
6596
6693
  if (this.running) {
6597
- this.target.emit(AnimateEvent.FRAME);
6598
6694
  if (this.changed && this.canvas.view)
6599
6695
  this.render();
6600
6696
  this.target.emit(RenderEvent.NEXT);
@@ -6668,36 +6764,6 @@ var LeaferUI = (function (exports) {
6668
6764
  });
6669
6765
  Platform.layout = Layouter.fullLayout;
6670
6766
 
6671
- const TextConvert = {};
6672
- const ColorConvert = {};
6673
- const PathArrow = {};
6674
- const Paint = {};
6675
- const PaintImage = {};
6676
- const PaintGradient = {};
6677
- const Effect = {};
6678
- const Export = {};
6679
- const State = {};
6680
-
6681
- function stateType(defaultValue) {
6682
- return decorateLeafAttr(defaultValue, (key) => attr({
6683
- set(value) {
6684
- this.__setAttr(key, value);
6685
- this.waitLeafer(() => { if (State.setStyle)
6686
- State.setStyle(this, key + 'Style', value); });
6687
- }
6688
- }));
6689
- }
6690
- function arrowType(defaultValue) {
6691
- return decorateLeafAttr(defaultValue, (key) => attr({
6692
- set(value) {
6693
- if (this.__setAttr(key, value)) {
6694
- const data = this.__;
6695
- data.__useArrow = data.startArrow !== 'none' || data.endArrow !== 'none';
6696
- doStrokeType(this);
6697
- }
6698
- }
6699
- }));
6700
- }
6701
6767
  function effectType(defaultValue) {
6702
6768
  return decorateLeafAttr(defaultValue, (key) => attr({
6703
6769
  set(value) {
@@ -6732,10 +6798,33 @@ var LeaferUI = (function (exports) {
6732
6798
  };
6733
6799
  }
6734
6800
 
6801
+ const TextConvert = {};
6802
+ const ColorConvert = {};
6803
+ const PathArrow = {};
6804
+ const Paint = {};
6805
+ const PaintImage = {};
6806
+ const PaintGradient = {};
6807
+ const Effect = {};
6808
+ const Export = {};
6809
+ const State = {
6810
+ setStyleName(_leaf, _styleName, _value) { return needPlugin('state'); },
6811
+ set(_leaf, _stateName) { return needPlugin('state'); }
6812
+ };
6813
+ const Transition = {
6814
+ list: {},
6815
+ register(attrName, fn) {
6816
+ Transition.list[attrName] = fn;
6817
+ },
6818
+ get(attrName) {
6819
+ return Transition.list[attrName];
6820
+ }
6821
+ };
6822
+
6735
6823
  const { parse } = PathConvert;
6736
6824
  const emptyPaint = {};
6737
6825
  const debug$2 = Debug.get('UIData');
6738
6826
  class UIData extends LeafData {
6827
+ get scale() { const { scaleX, scaleY } = this; return scaleX !== scaleY ? { x: scaleX, y: scaleY } : scaleX; }
6739
6828
  get __strokeWidth() {
6740
6829
  const { strokeWidth, strokeWidthFixed } = this;
6741
6830
  if (strokeWidthFixed) {
@@ -6754,9 +6843,10 @@ var LeaferUI = (function (exports) {
6754
6843
  get __autoSide() { return !this._width || !this._height; }
6755
6844
  get __autoSize() { return !this._width && !this._height; }
6756
6845
  setVisible(value) {
6757
- if (this.__leaf.leafer)
6758
- this.__leaf.leafer.watcher.hasVisible = true;
6759
6846
  this._visible = value;
6847
+ const { leafer } = this.__leaf;
6848
+ if (leafer)
6849
+ leafer.watcher.hasVisible = true;
6760
6850
  }
6761
6851
  setWidth(value) {
6762
6852
  if (value < 0) {
@@ -6947,7 +7037,7 @@ var LeaferUI = (function (exports) {
6947
7037
  __setImageFill(value) {
6948
7038
  if (this.__leaf.image)
6949
7039
  this.__leaf.image = null;
6950
- this.fill = value ? { type: 'image', mode: 'strench', url: value } : undefined;
7040
+ this.fill = value ? { type: 'image', mode: 'stretch', url: value } : undefined;
6951
7041
  }
6952
7042
  __getData() {
6953
7043
  const data = super.__getData();
@@ -7137,19 +7227,8 @@ var LeaferUI = (function (exports) {
7137
7227
  exports.UI = UI_1 = class UI extends exports.Leaf {
7138
7228
  get app() { return this.leafer && this.leafer.app; }
7139
7229
  get isFrame() { return false; }
7140
- set scale(value) {
7141
- if (typeof value === 'number') {
7142
- this.scaleX = this.scaleY = value;
7143
- }
7144
- else {
7145
- this.scaleX = value.x;
7146
- this.scaleY = value.y;
7147
- }
7148
- }
7149
- get scale() {
7150
- const { scaleX, scaleY } = this;
7151
- return scaleX !== scaleY ? { x: scaleX, y: scaleY } : scaleX;
7152
- }
7230
+ set scale(value) { MathHelper.assignScale(this, value); }
7231
+ get scale() { return this.__.scale; }
7153
7232
  get pen() {
7154
7233
  const { path } = this.__;
7155
7234
  pen.set(this.path = path || []);
@@ -7164,8 +7243,15 @@ var LeaferUI = (function (exports) {
7164
7243
  super(data);
7165
7244
  }
7166
7245
  reset(_data) { }
7167
- set(data) {
7168
- Object.assign(this, data);
7246
+ set(data, isTemp) {
7247
+ if (isTemp) {
7248
+ this.lockNormalStyle = true;
7249
+ Object.assign(this, data);
7250
+ this.lockNormalStyle = false;
7251
+ }
7252
+ else {
7253
+ Object.assign(this, data);
7254
+ }
7169
7255
  }
7170
7256
  get(name) {
7171
7257
  return typeof name === 'string' ? this.__.__getInput(name) : this.__.__getInputData(name);
@@ -7228,11 +7314,18 @@ var LeaferUI = (function (exports) {
7228
7314
  drawer.rect(x, y, width, height);
7229
7315
  }
7230
7316
  }
7317
+ animate(_keyframe, _options, _type, _isTemp) {
7318
+ return needPlugin('animate');
7319
+ }
7320
+ killAnimate(_type) { }
7231
7321
  export(filename, options) {
7232
7322
  return Export.export(this, filename, options);
7233
7323
  }
7234
- clone() {
7235
- return UI_1.one(this.toJSON());
7324
+ clone(data) {
7325
+ const json = this.toJSON();
7326
+ if (data)
7327
+ Object.assign(json, data);
7328
+ return UI_1.one(json);
7236
7329
  }
7237
7330
  static one(data, x, y, width, height) {
7238
7331
  return UICreator.get(data.tag || this.prototype.__tag, data, x, y, width, height);
@@ -7248,6 +7341,8 @@ var LeaferUI = (function (exports) {
7248
7341
  static setEditInner(_editorName) { }
7249
7342
  destroy() {
7250
7343
  this.fill = this.stroke = null;
7344
+ if (this.__animate)
7345
+ this.killAnimate();
7251
7346
  super.destroy();
7252
7347
  }
7253
7348
  };
@@ -7275,12 +7370,6 @@ var LeaferUI = (function (exports) {
7275
7370
  __decorate([
7276
7371
  visibleType(true)
7277
7372
  ], exports.UI.prototype, "visible", void 0);
7278
- __decorate([
7279
- stateType(false)
7280
- ], exports.UI.prototype, "selected", void 0);
7281
- __decorate([
7282
- stateType(false)
7283
- ], exports.UI.prototype, "disabled", void 0);
7284
7373
  __decorate([
7285
7374
  surfaceType(false)
7286
7375
  ], exports.UI.prototype, "locked", void 0);
@@ -7353,45 +7442,9 @@ var LeaferUI = (function (exports) {
7353
7442
  __decorate([
7354
7443
  pathType(true)
7355
7444
  ], exports.UI.prototype, "closed", void 0);
7356
- __decorate([
7357
- autoLayoutType(false)
7358
- ], exports.UI.prototype, "flow", void 0);
7359
7445
  __decorate([
7360
7446
  boundsType(0)
7361
7447
  ], exports.UI.prototype, "padding", void 0);
7362
- __decorate([
7363
- boundsType(0)
7364
- ], exports.UI.prototype, "gap", void 0);
7365
- __decorate([
7366
- boundsType('top-left')
7367
- ], exports.UI.prototype, "flowAlign", void 0);
7368
- __decorate([
7369
- boundsType(false)
7370
- ], exports.UI.prototype, "flowWrap", void 0);
7371
- __decorate([
7372
- boundsType('box')
7373
- ], exports.UI.prototype, "itemBox", void 0);
7374
- __decorate([
7375
- boundsType(true)
7376
- ], exports.UI.prototype, "inFlow", void 0);
7377
- __decorate([
7378
- boundsType()
7379
- ], exports.UI.prototype, "autoWidth", void 0);
7380
- __decorate([
7381
- boundsType()
7382
- ], exports.UI.prototype, "autoHeight", void 0);
7383
- __decorate([
7384
- boundsType()
7385
- ], exports.UI.prototype, "lockRatio", void 0);
7386
- __decorate([
7387
- boundsType()
7388
- ], exports.UI.prototype, "autoBox", void 0);
7389
- __decorate([
7390
- boundsType()
7391
- ], exports.UI.prototype, "widthRange", void 0);
7392
- __decorate([
7393
- boundsType()
7394
- ], exports.UI.prototype, "heightRange", void 0);
7395
7448
  __decorate([
7396
7449
  dataType(false)
7397
7450
  ], exports.UI.prototype, "draggable", void 0);
@@ -7455,12 +7508,6 @@ var LeaferUI = (function (exports) {
7455
7508
  __decorate([
7456
7509
  strokeType(10)
7457
7510
  ], exports.UI.prototype, "miterLimit", void 0);
7458
- __decorate([
7459
- arrowType('none')
7460
- ], exports.UI.prototype, "startArrow", void 0);
7461
- __decorate([
7462
- arrowType('none')
7463
- ], exports.UI.prototype, "endArrow", void 0);
7464
7511
  __decorate([
7465
7512
  pathType(0)
7466
7513
  ], exports.UI.prototype, "cornerRadius", void 0);
@@ -7482,24 +7529,6 @@ var LeaferUI = (function (exports) {
7482
7529
  __decorate([
7483
7530
  effectType()
7484
7531
  ], exports.UI.prototype, "grayscale", void 0);
7485
- __decorate([
7486
- dataType()
7487
- ], exports.UI.prototype, "normalStyle", void 0);
7488
- __decorate([
7489
- dataType()
7490
- ], exports.UI.prototype, "hoverStyle", void 0);
7491
- __decorate([
7492
- dataType()
7493
- ], exports.UI.prototype, "pressStyle", void 0);
7494
- __decorate([
7495
- dataType()
7496
- ], exports.UI.prototype, "focusStyle", void 0);
7497
- __decorate([
7498
- dataType()
7499
- ], exports.UI.prototype, "selectedStyle", void 0);
7500
- __decorate([
7501
- dataType()
7502
- ], exports.UI.prototype, "disabledStyle", void 0);
7503
7532
  __decorate([
7504
7533
  dataType({})
7505
7534
  ], exports.UI.prototype, "data", void 0);
@@ -7526,7 +7555,7 @@ var LeaferUI = (function (exports) {
7526
7555
  if (!this.children)
7527
7556
  this.children = [];
7528
7557
  }
7529
- set(data) {
7558
+ set(data, isTemp) {
7530
7559
  if (data.children) {
7531
7560
  const { children } = data;
7532
7561
  delete data.children;
@@ -7536,7 +7565,7 @@ var LeaferUI = (function (exports) {
7536
7565
  else {
7537
7566
  this.clear();
7538
7567
  }
7539
- super.set(data);
7568
+ super.set(data, isTemp);
7540
7569
  let child;
7541
7570
  children.forEach(childData => {
7542
7571
  child = childData.__ ? childData : UICreator.get(childData.tag, childData);
@@ -7545,7 +7574,7 @@ var LeaferUI = (function (exports) {
7545
7574
  data.children = children;
7546
7575
  }
7547
7576
  else {
7548
- super.set(data);
7577
+ super.set(data, isTemp);
7549
7578
  }
7550
7579
  }
7551
7580
  toJSON(options) {
@@ -7872,7 +7901,7 @@ var LeaferUI = (function (exports) {
7872
7901
  }
7873
7902
  }
7874
7903
  zoom(_zoomType, _padding, _fixedScale) {
7875
- return debug$1.error('need @leafer-in/view');
7904
+ return needPlugin('view');
7876
7905
  }
7877
7906
  getValidMove(moveX, moveY) { return { x: moveX, y: moveY }; }
7878
7907
  getValidScale(changeScale) { return changeScale; }
@@ -8395,19 +8424,18 @@ var LeaferUI = (function (exports) {
8395
8424
  this.paint();
8396
8425
  }
8397
8426
  paint() {
8398
- this.forceUpdate('fill');
8427
+ this.forceRender();
8399
8428
  }
8400
8429
  __drawAfterFill(canvas, _options) {
8401
- const origin = this.canvas.view;
8402
- const { width, height } = this;
8403
- if (this.__.cornerRadius || this.pathInputed) {
8430
+ const { width, height, cornerRadius } = this.__, { view } = this.canvas;
8431
+ if (cornerRadius || this.pathInputed) {
8404
8432
  canvas.save();
8405
8433
  canvas.clip();
8406
- canvas.drawImage(this.canvas.view, 0, 0, origin.width, origin.height, 0, 0, width, height);
8434
+ canvas.drawImage(view, 0, 0, view.width, view.height, 0, 0, width, height);
8407
8435
  canvas.restore();
8408
8436
  }
8409
8437
  else {
8410
- canvas.drawImage(this.canvas.view, 0, 0, origin.width, origin.height, 0, 0, width, height);
8438
+ canvas.drawImage(view, 0, 0, view.width, view.height, 0, 0, width, height);
8411
8439
  }
8412
8440
  }
8413
8441
  __updateSize() {
@@ -9046,6 +9074,8 @@ var LeaferUI = (function (exports) {
9046
9074
  let { width, height } = image;
9047
9075
  if (paint.padding)
9048
9076
  box = tempBox.set(box).shrink(paint.padding);
9077
+ if (paint.mode === 'strench')
9078
+ paint.mode = 'stretch';
9049
9079
  const { opacity, mode, align, offset, scale, size, rotation, repeat } = paint;
9050
9080
  const sameBox = box.width === width && box.height === height;
9051
9081
  const data = { mode };
@@ -9074,7 +9104,7 @@ var LeaferUI = (function (exports) {
9074
9104
  if (offset)
9075
9105
  x += offset.x, y += offset.y;
9076
9106
  switch (mode) {
9077
- case 'strench':
9107
+ case 'stretch':
9078
9108
  if (!sameBox)
9079
9109
  width = box.width, height = box.height;
9080
9110
  break;
@@ -9101,7 +9131,7 @@ var LeaferUI = (function (exports) {
9101
9131
  translate(data.transform, box.x, box.y);
9102
9132
  }
9103
9133
  }
9104
- if (scaleX && mode !== 'strench') {
9134
+ if (scaleX && mode !== 'stretch') {
9105
9135
  data.scaleX = scaleX;
9106
9136
  data.scaleY = scaleY;
9107
9137
  }
@@ -9205,7 +9235,7 @@ var LeaferUI = (function (exports) {
9205
9235
  const { ceil, abs: abs$1 } = Math;
9206
9236
  function createPattern(ui, paint, pixelRatio) {
9207
9237
  let { scaleX, scaleY } = ImageManager.patternLocked ? ui.__world : ui.__nowWorld;
9208
- const id = scaleX + '-' + scaleY;
9238
+ const id = scaleX + '-' + scaleY + '-' + pixelRatio;
9209
9239
  if (paint.patternId !== id && !ui.destroyed) {
9210
9240
  scaleX = abs$1(scaleX);
9211
9241
  scaleY = abs$1(scaleY);
@@ -9267,7 +9297,8 @@ var LeaferUI = (function (exports) {
9267
9297
  const { abs } = Math;
9268
9298
  function checkImage(ui, canvas, paint, allowPaint) {
9269
9299
  const { scaleX, scaleY } = ImageManager.patternLocked ? ui.__world : ui.__nowWorld;
9270
- if (!paint.data || (paint.patternId === scaleX + '-' + scaleY && !Export.running)) {
9300
+ const { pixelRatio } = canvas;
9301
+ if (!paint.data || (paint.patternId === scaleX + '-' + scaleY + '-' + pixelRatio && !Export.running)) {
9271
9302
  return false;
9272
9303
  }
9273
9304
  else {
@@ -9275,8 +9306,8 @@ var LeaferUI = (function (exports) {
9275
9306
  if (allowPaint) {
9276
9307
  if (!data.repeat) {
9277
9308
  let { width, height } = data;
9278
- width *= abs(scaleX) * canvas.pixelRatio;
9279
- height *= abs(scaleY) * canvas.pixelRatio;
9309
+ width *= abs(scaleX) * pixelRatio;
9310
+ height *= abs(scaleY) * pixelRatio;
9280
9311
  if (data.scaleX) {
9281
9312
  width *= data.scaleX;
9282
9313
  height *= data.scaleY;
@@ -9302,14 +9333,14 @@ var LeaferUI = (function (exports) {
9302
9333
  }
9303
9334
  else {
9304
9335
  if (!paint.style || paint.sync || Export.running) {
9305
- createPattern(ui, paint, canvas.pixelRatio);
9336
+ createPattern(ui, paint, pixelRatio);
9306
9337
  }
9307
9338
  else {
9308
9339
  if (!paint.patternTask) {
9309
9340
  paint.patternTask = ImageManager.patternTasker.add(() => __awaiter(this, void 0, void 0, function* () {
9310
9341
  paint.patternTask = null;
9311
9342
  if (canvas.bounds.hit(ui.__nowWorld))
9312
- createPattern(ui, paint, canvas.pixelRatio);
9343
+ createPattern(ui, paint, pixelRatio);
9313
9344
  ui.forceUpdate('surface');
9314
9345
  }), 300);
9315
9346
  }
@@ -9373,14 +9404,16 @@ var LeaferUI = (function (exports) {
9373
9404
  return data;
9374
9405
  }
9375
9406
  function applyStops(gradient, stops, opacity) {
9376
- let stop;
9377
- for (let i = 0, len = stops.length; i < len; i++) {
9378
- stop = stops[i];
9379
- if (typeof stop === 'string') {
9380
- gradient.addColorStop(i / (len - 1), ColorConvert.string(stop, opacity));
9381
- }
9382
- else {
9383
- gradient.addColorStop(stop.offset, ColorConvert.string(stop.color, opacity));
9407
+ if (stops) {
9408
+ let stop;
9409
+ for (let i = 0, len = stops.length; i < len; i++) {
9410
+ stop = stops[i];
9411
+ if (typeof stop === 'string') {
9412
+ gradient.addColorStop(i / (len - 1), ColorConvert.string(stop, opacity));
9413
+ }
9414
+ else {
9415
+ gradient.addColorStop(stop.offset, ColorConvert.string(stop.color, opacity));
9416
+ }
9384
9417
  }
9385
9418
  }
9386
9419
  }
@@ -10136,10 +10169,15 @@ var LeaferUI = (function (exports) {
10136
10169
  };
10137
10170
 
10138
10171
  function string(color, opacity) {
10139
- if (typeof color === 'string')
10140
- return color;
10172
+ const doOpacity = typeof opacity === 'number' && opacity !== 1;
10173
+ if (typeof color === 'string') {
10174
+ if (doOpacity && ColorConvert.object)
10175
+ color = ColorConvert.object(color);
10176
+ else
10177
+ return color;
10178
+ }
10141
10179
  let a = color.a === undefined ? 1 : color.a;
10142
- if (opacity)
10180
+ if (doOpacity)
10143
10181
  a *= opacity;
10144
10182
  const rgb = color.r + ',' + color.g + ',' + color.b;
10145
10183
  return a === 1 ? 'rgb(' + rgb + ')' : 'rgba(' + rgb + ',' + a + ')';
@@ -10347,7 +10385,6 @@ var LeaferUI = (function (exports) {
10347
10385
  useCanvas();
10348
10386
 
10349
10387
  exports.AlignHelper = AlignHelper;
10350
- exports.AnimateEvent = AnimateEvent;
10351
10388
  exports.AroundHelper = AroundHelper;
10352
10389
  exports.AutoBounds = AutoBounds;
10353
10390
  exports.BezierHelper = BezierHelper;
@@ -10368,6 +10405,7 @@ var LeaferUI = (function (exports) {
10368
10405
  exports.EllipseHelper = EllipseHelper;
10369
10406
  exports.Event = Event;
10370
10407
  exports.EventCreator = EventCreator;
10408
+ exports.Eventer = Eventer;
10371
10409
  exports.Export = Export;
10372
10410
  exports.FileHelper = FileHelper;
10373
10411
  exports.FrameData = FrameData;
@@ -10438,6 +10476,7 @@ var LeaferUI = (function (exports) {
10438
10476
  exports.TaskProcessor = TaskProcessor;
10439
10477
  exports.TextConvert = TextConvert;
10440
10478
  exports.TextData = TextData;
10479
+ exports.Transition = Transition;
10441
10480
  exports.TwoPointBoundsHelper = TwoPointBoundsHelper;
10442
10481
  exports.UIBounds = UIBounds;
10443
10482
  exports.UICreator = UICreator;
@@ -10449,7 +10488,6 @@ var LeaferUI = (function (exports) {
10449
10488
  exports.Watcher = Watcher;
10450
10489
  exports.affectRenderBoundsType = affectRenderBoundsType;
10451
10490
  exports.affectStrokeBoundsType = affectStrokeBoundsType;
10452
- exports.arrowType = arrowType;
10453
10491
  exports.attr = attr;
10454
10492
  exports.autoLayoutType = autoLayoutType;
10455
10493
  exports.boundsType = boundsType;
@@ -10472,10 +10510,11 @@ var LeaferUI = (function (exports) {
10472
10510
  exports.getMatrixData = getMatrixData;
10473
10511
  exports.getPointData = getPointData;
10474
10512
  exports.hitType = hitType;
10475
- exports.inviteCode = inviteCode;
10513
+ exports.isNull = isNull;
10476
10514
  exports.layoutProcessor = layoutProcessor;
10477
10515
  exports.maskType = maskType;
10478
10516
  exports.naturalBoundsType = naturalBoundsType;
10517
+ exports.needPlugin = needPlugin;
10479
10518
  exports.opacityType = opacityType;
10480
10519
  exports.pathInputType = pathInputType;
10481
10520
  exports.pathType = pathType;
@@ -10489,7 +10528,6 @@ var LeaferUI = (function (exports) {
10489
10528
  exports.rotationType = rotationType;
10490
10529
  exports.scaleType = scaleType;
10491
10530
  exports.sortType = sortType;
10492
- exports.stateType = stateType;
10493
10531
  exports.strokeType = strokeType;
10494
10532
  exports.surfaceType = surfaceType;
10495
10533
  exports.tempBounds = tempBounds$1;