@leafer-game/worker 1.12.1 → 1.12.2

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.
@@ -461,9 +461,9 @@ function getMatrixData() {
461
461
 
462
462
  const {sin: sin$6, cos: cos$6, acos: acos, sqrt: sqrt$5} = Math;
463
463
 
464
- const {float: float$3} = MathHelper;
464
+ const {float: float$5} = MathHelper;
465
465
 
466
- const tempPoint$4 = {};
466
+ const tempPoint$5 = {};
467
467
 
468
468
  function getWorld() {
469
469
  return Object.assign(Object.assign(Object.assign({}, getMatrixData()), getBoundsData()), {
@@ -522,8 +522,8 @@ const MatrixHelper = {
522
522
  to.f = t.f * pixelRatio;
523
523
  },
524
524
  scaleOfOuter(t, origin, scaleX, scaleY) {
525
- M$7.toInnerPoint(t, origin, tempPoint$4);
526
- M$7.scaleOfInner(t, tempPoint$4, scaleX, scaleY);
525
+ M$7.toInnerPoint(t, origin, tempPoint$5);
526
+ M$7.scaleOfInner(t, tempPoint$5, scaleX, scaleY);
527
527
  },
528
528
  scaleOfInner(t, origin, scaleX, scaleY = scaleX) {
529
529
  M$7.translateInner(t, origin.x, origin.y);
@@ -541,8 +541,8 @@ const MatrixHelper = {
541
541
  t.d = c * sinR + d * cosR;
542
542
  },
543
543
  rotateOfOuter(t, origin, rotation) {
544
- M$7.toInnerPoint(t, origin, tempPoint$4);
545
- M$7.rotateOfInner(t, tempPoint$4, rotation);
544
+ M$7.toInnerPoint(t, origin, tempPoint$5);
545
+ M$7.rotateOfInner(t, tempPoint$5, rotation);
546
546
  },
547
547
  rotateOfInner(t, origin, rotation) {
548
548
  M$7.translateInner(t, origin.x, origin.y);
@@ -563,8 +563,8 @@ const MatrixHelper = {
563
563
  }
564
564
  },
565
565
  skewOfOuter(t, origin, skewX, skewY) {
566
- M$7.toInnerPoint(t, origin, tempPoint$4);
567
- M$7.skewOfInner(t, tempPoint$4, skewX, skewY);
566
+ M$7.toInnerPoint(t, origin, tempPoint$5);
567
+ M$7.skewOfInner(t, tempPoint$5, skewX, skewY);
568
568
  },
569
569
  skewOfInner(t, origin, skewX, skewY = 0) {
570
570
  M$7.translateInner(t, origin.x, origin.y);
@@ -712,12 +712,12 @@ const MatrixHelper = {
712
712
  const cosR = c / scaleY;
713
713
  rotation = PI_2 - (d > 0 ? acos(-cosR) : -acos(cosR));
714
714
  }
715
- const cosR = float$3(cos$6(rotation));
715
+ const cosR = float$5(cos$6(rotation));
716
716
  const sinR = sin$6(rotation);
717
- scaleX = float$3(scaleX), scaleY = float$3(scaleY);
718
- skewX = cosR ? float$3((c / scaleY + sinR) / cosR / OneRadian, 9) : 0;
719
- skewY = cosR ? float$3((b / scaleX - sinR) / cosR / OneRadian, 9) : 0;
720
- rotation = float$3(rotation / OneRadian);
717
+ scaleX = float$5(scaleX), scaleY = float$5(scaleY);
718
+ skewX = cosR ? float$5((c / scaleY + sinR) / cosR / OneRadian, 9) : 0;
719
+ skewY = cosR ? float$5((b / scaleX - sinR) / cosR / OneRadian, 9) : 0;
720
+ rotation = float$5(rotation / OneRadian);
721
721
  } else {
722
722
  scaleX = a;
723
723
  scaleY = d;
@@ -761,6 +761,8 @@ const MatrixHelper = {
761
761
 
762
762
  const M$7 = MatrixHelper;
763
763
 
764
+ const {float: float$4} = MathHelper;
765
+
764
766
  const {toInnerPoint: toInnerPoint$2, toOuterPoint: toOuterPoint$3} = MatrixHelper;
765
767
 
766
768
  const {sin: sin$5, cos: cos$5, abs: abs$6, sqrt: sqrt$4, atan2: atan2$2, min: min$2, round: round$5} = Math;
@@ -812,22 +814,27 @@ const PointHelper = {
812
814
  },
813
815
  tempToInnerOf(t, matrix) {
814
816
  const {tempPoint: temp} = P$5;
815
- copy$a(temp, t);
817
+ copy$9(temp, t);
816
818
  toInnerPoint$2(matrix, temp, temp);
817
819
  return temp;
818
820
  },
819
821
  tempToOuterOf(t, matrix) {
820
822
  const {tempPoint: temp} = P$5;
821
- copy$a(temp, t);
823
+ copy$9(temp, t);
822
824
  toOuterPoint$3(matrix, temp, temp);
823
825
  return temp;
824
826
  },
825
827
  tempToInnerRadiusPointOf(t, matrix) {
826
828
  const {tempRadiusPoint: temp} = P$5;
827
- copy$a(temp, t);
829
+ copy$9(temp, t);
828
830
  P$5.toInnerRadiusPointOf(t, matrix, temp);
829
831
  return temp;
830
832
  },
833
+ copyRadiusPoint(t, point, x, y) {
834
+ copy$9(t, point);
835
+ setRadius(t, x, y);
836
+ return t;
837
+ },
831
838
  toInnerRadiusPointOf(t, matrix, to) {
832
839
  to || (to = t);
833
840
  toInnerPoint$2(matrix, t, to);
@@ -895,7 +902,7 @@ const PointHelper = {
895
902
  return points;
896
903
  },
897
904
  isSame(t, point) {
898
- return t.x === point.x && t.y === point.y;
905
+ return float$4(t.x) === float$4(point.x) && float$4(t.y) === float$4(point.y);
899
906
  },
900
907
  reset(t) {
901
908
  P$5.reset(t);
@@ -904,7 +911,7 @@ const PointHelper = {
904
911
 
905
912
  const P$5 = PointHelper;
906
913
 
907
- const {getDistanceFrom: getDistanceFrom, copy: copy$a, getAtan2: getAtan2} = P$5;
914
+ const {getDistanceFrom: getDistanceFrom, copy: copy$9, setRadius: setRadius, getAtan2: getAtan2} = P$5;
908
915
 
909
916
  class Point {
910
917
  constructor(x, y) {
@@ -979,7 +986,7 @@ class Point {
979
986
  }
980
987
  }
981
988
 
982
- const tempPoint$3 = new Point;
989
+ const tempPoint$4 = new Point;
983
990
 
984
991
  class Matrix {
985
992
  constructor(a, b, c, d, e, f) {
@@ -1250,7 +1257,7 @@ const {tempPointBounds: tempPointBounds$1, setPoint: setPoint$2, addPoint: addPo
1250
1257
 
1251
1258
  const {toOuterPoint: toOuterPoint$2} = MatrixHelper;
1252
1259
 
1253
- const {float: float$2, fourNumber: fourNumber$1} = MathHelper;
1260
+ const {float: float$3, fourNumber: fourNumber$1} = MathHelper;
1254
1261
 
1255
1262
  const {floor: floor$1, ceil: ceil$2} = Math;
1256
1263
 
@@ -1315,7 +1322,7 @@ const BoundsHelper = {
1315
1322
  return t;
1316
1323
  },
1317
1324
  toOffsetOutBounds(t, to, offsetBounds) {
1318
- if (!to) to = t; else copy$9(to, t);
1325
+ if (!to) to = t; else copy$8(to, t);
1319
1326
  if (!offsetBounds) offsetBounds = t;
1320
1327
  to.offsetX = B.maxX(offsetBounds);
1321
1328
  to.offsetY = B.maxY(offsetBounds);
@@ -1425,10 +1432,10 @@ const BoundsHelper = {
1425
1432
  }
1426
1433
  },
1427
1434
  float(t, maxLength) {
1428
- t.x = float$2(t.x, maxLength);
1429
- t.y = float$2(t.y, maxLength);
1430
- t.width = float$2(t.width, maxLength);
1431
- t.height = float$2(t.height, maxLength);
1435
+ t.x = float$3(t.x, maxLength);
1436
+ t.y = float$3(t.y, maxLength);
1437
+ t.width = float$3(t.width, maxLength);
1438
+ t.height = float$3(t.height, maxLength);
1432
1439
  },
1433
1440
  add(t, bounds, isPoint) {
1434
1441
  right$1 = t.x + t.width;
@@ -1462,7 +1469,7 @@ const BoundsHelper = {
1462
1469
  if (bounds && (bounds.width || bounds.height)) {
1463
1470
  if (first) {
1464
1471
  first = false;
1465
- if (!addMode) copy$9(t, bounds);
1472
+ if (!addMode) copy$8(t, bounds);
1466
1473
  } else {
1467
1474
  add$2(t, bounds);
1468
1475
  }
@@ -1549,7 +1556,7 @@ const BoundsHelper = {
1549
1556
 
1550
1557
  const B = BoundsHelper;
1551
1558
 
1552
- const {add: add$2, copy: copy$9} = B;
1559
+ const {add: add$2, copy: copy$8} = B;
1553
1560
 
1554
1561
  class Bounds {
1555
1562
  get minX() {
@@ -2247,7 +2254,7 @@ __decorate([ contextMethod() ], Canvas$1.prototype, "measureText", null);
2247
2254
 
2248
2255
  __decorate([ contextMethod() ], Canvas$1.prototype, "strokeText", null);
2249
2256
 
2250
- const {copy: copy$8, multiplyParent: multiplyParent$4, pixelScale: pixelScale} = MatrixHelper, {round: round$4} = Math, tempPixelBounds = new Bounds, tempPixelBounds2 = new Bounds;
2257
+ const {copy: copy$7, multiplyParent: multiplyParent$4, pixelScale: pixelScale} = MatrixHelper, {round: round$4} = Math, tempPixelBounds = new Bounds, tempPixelBounds2 = new Bounds;
2251
2258
 
2252
2259
  const minSize = {
2253
2260
  width: 1,
@@ -2407,7 +2414,7 @@ class LeaferCanvasBase extends Canvas$1 {
2407
2414
  const {pixelRatio: pixelRatio} = this;
2408
2415
  this.filter = `blur(${blur * pixelRatio}px)`;
2409
2416
  }
2410
- copyWorld(canvas, from, to, blendMode, ceilPixel = true) {
2417
+ copyWorld(canvas, from, to, blendMode, ceilPixel) {
2411
2418
  if (blendMode) this.blendMode = blendMode;
2412
2419
  if (from) {
2413
2420
  this.setTempPixelBounds(from, ceilPixel);
@@ -2418,7 +2425,7 @@ class LeaferCanvasBase extends Canvas$1 {
2418
2425
  }
2419
2426
  if (blendMode) this.blendMode = "source-over";
2420
2427
  }
2421
- copyWorldToInner(canvas, fromWorld, toInnerBounds, blendMode, ceilPixel = true) {
2428
+ copyWorldToInner(canvas, fromWorld, toInnerBounds, blendMode, ceilPixel) {
2422
2429
  if (fromWorld.b || fromWorld.c) {
2423
2430
  this.save();
2424
2431
  this.resetTransform();
@@ -2431,7 +2438,7 @@ class LeaferCanvasBase extends Canvas$1 {
2431
2438
  if (blendMode) this.blendMode = "source-over";
2432
2439
  }
2433
2440
  }
2434
- copyWorldByReset(canvas, from, to, blendMode, onlyResetTransform, ceilPixel = true) {
2441
+ copyWorldByReset(canvas, from, to, blendMode, onlyResetTransform, ceilPixel) {
2435
2442
  this.resetTransform();
2436
2443
  this.copyWorld(canvas, from, to, blendMode, ceilPixel);
2437
2444
  if (!onlyResetTransform) this.useWorldTransform();
@@ -2501,7 +2508,7 @@ class LeaferCanvasBase extends Canvas$1 {
2501
2508
  getSameCanvas(useSameWorldTransform, useSameSmooth) {
2502
2509
  const {size: size, pixelSnap: pixelSnap} = this, canvas = this.manager ? this.manager.get(size) : Creator.canvas(Object.assign({}, size));
2503
2510
  canvas.save();
2504
- if (useSameWorldTransform) copy$8(canvas.worldTransform, this.worldTransform), canvas.useWorldTransform();
2511
+ if (useSameWorldTransform) copy$7(canvas.worldTransform, this.worldTransform), canvas.useWorldTransform();
2505
2512
  if (useSameSmooth) canvas.smooth = this.smooth;
2506
2513
  canvas.pixelSnap !== pixelSnap && (canvas.pixelSnap = pixelSnap);
2507
2514
  return canvas;
@@ -2650,7 +2657,7 @@ const {set: set$1, toNumberPoints: toNumberPoints} = PointHelper;
2650
2657
 
2651
2658
  const {M: M$6, L: L$7, C: C$5, Q: Q$4, Z: Z$6} = PathCommandMap;
2652
2659
 
2653
- const tempPoint$2 = {};
2660
+ const tempPoint$3 = {};
2654
2661
 
2655
2662
  const BezierHelper = {
2656
2663
  points(data, originPoints, curve, close) {
@@ -2658,7 +2665,7 @@ const BezierHelper = {
2658
2665
  data.push(M$6, points[0], points[1]);
2659
2666
  if (curve && points.length > 5) {
2660
2667
  let aX, aY, bX, bY, cX, cY, c1X, c1Y, c2X, c2Y;
2661
- let ba, cb, d, len = points.length;
2668
+ let baX, baY, ba, cb, d, len = points.length;
2662
2669
  const t = curve === true ? .5 : curve;
2663
2670
  if (close) {
2664
2671
  points = [ points[len - 2], points[len - 1], ...points, points[0], points[1], points[2], points[3] ];
@@ -2671,7 +2678,9 @@ const BezierHelper = {
2671
2678
  bY = points[i + 1];
2672
2679
  cX = points[i + 2];
2673
2680
  cY = points[i + 3];
2674
- ba = sqrt$3(pow$1(bX - aX, 2) + pow$1(bY - aY, 2));
2681
+ baX = bX - aX;
2682
+ baY = bY - aY;
2683
+ ba = sqrt$3(pow$1(baX, 2) + pow$1(baY, 2));
2675
2684
  cb = sqrt$3(pow$1(cX - bX, 2) + pow$1(cY - bY, 2));
2676
2685
  if (!ba && !cb) continue;
2677
2686
  d = ba + cb;
@@ -2684,7 +2693,7 @@ const BezierHelper = {
2684
2693
  if (i === 2) {
2685
2694
  if (!close) data.push(Q$4, c1X, c1Y, bX, bY);
2686
2695
  } else {
2687
- data.push(C$5, c2X, c2Y, c1X, c1Y, bX, bY);
2696
+ if (baX || baY) data.push(C$5, c2X, c2Y, c1X, c1Y, bX, bY);
2688
2697
  }
2689
2698
  c2X = bX + cb * cX;
2690
2699
  c2Y = bY + cb * cY;
@@ -2819,8 +2828,8 @@ const BezierHelper = {
2819
2828
  addMode ? addPoint$1(pointBounds, fromX, fromY) : setPoint$1(pointBounds, fromX, fromY);
2820
2829
  addPoint$1(pointBounds, toX, toY);
2821
2830
  for (let i = 0, len = tList.length; i < len; i++) {
2822
- getPointAndSet(tList[i], fromX, fromY, x1, y1, x2, y2, toX, toY, tempPoint$2);
2823
- addPoint$1(pointBounds, tempPoint$2.x, tempPoint$2.y);
2831
+ getPointAndSet(tList[i], fromX, fromY, x1, y1, x2, y2, toX, toY, tempPoint$3);
2832
+ addPoint$1(pointBounds, tempPoint$3.x, tempPoint$3.y);
2824
2833
  }
2825
2834
  },
2826
2835
  getPointAndSet(t, fromX, fromY, x1, y1, x2, y2, toX, toY, setPoint) {
@@ -3269,6 +3278,7 @@ const PathCommandDataHelper = {
3269
3278
  }
3270
3279
  },
3271
3280
  ellipse(data, x, y, radiusX, radiusY, rotation, startAngle, endAngle, anticlockwise) {
3281
+ if (radiusX === radiusY) return arc$2(data, x, y, radiusX, startAngle, endAngle, anticlockwise);
3272
3282
  if (isNull(rotation)) {
3273
3283
  data.push(F$3, x, y, radiusX, radiusY);
3274
3284
  } else {
@@ -3281,6 +3291,7 @@ const PathCommandDataHelper = {
3281
3291
  if (isNull(startAngle)) {
3282
3292
  data.push(P$2, x, y, radius);
3283
3293
  } else {
3294
+ if (isNull(startAngle)) startAngle = 0;
3284
3295
  if (isNull(endAngle)) endAngle = 360;
3285
3296
  data.push(O$2, x, y, radius, startAngle, endAngle, anticlockwise ? 1 : 0);
3286
3297
  }
@@ -3490,7 +3501,7 @@ const {M: M$2, L: L$3, C: C$1, Q: Q, Z: Z$2, N: N, D: D$1, X: X, G: G, F: F$1, O
3490
3501
 
3491
3502
  const {toTwoPointBounds: toTwoPointBounds, toTwoPointBoundsByQuadraticCurve: toTwoPointBoundsByQuadraticCurve, arcTo: arcTo$1, arc: arc, ellipse: ellipse$1} = BezierHelper;
3492
3503
 
3493
- const {addPointBounds: addPointBounds, copy: copy$7, addPoint: addPoint, setPoint: setPoint, addBounds: addBounds, toBounds: toBounds$1} = TwoPointBoundsHelper;
3504
+ const {addPointBounds: addPointBounds, copy: copy$6, addPoint: addPoint, setPoint: setPoint, addBounds: addBounds, toBounds: toBounds$1} = TwoPointBoundsHelper;
3494
3505
 
3495
3506
  const debug$a = Debug.get("PathBounds");
3496
3507
 
@@ -3572,7 +3583,7 @@ const PathBounds = {
3572
3583
 
3573
3584
  case G:
3574
3585
  ellipse$1(null, data[i + 1], data[i + 2], data[i + 3], data[i + 4], data[i + 5], data[i + 6], data[i + 7], data[i + 8], tempPointBounds, setEndPoint);
3575
- i === 0 ? copy$7(setPointBounds, tempPointBounds) : addPointBounds(setPointBounds, tempPointBounds);
3586
+ i === 0 ? copy$6(setPointBounds, tempPointBounds) : addPointBounds(setPointBounds, tempPointBounds);
3576
3587
  x = setEndPoint.x;
3577
3588
  y = setEndPoint.y;
3578
3589
  i += 9;
@@ -3590,7 +3601,7 @@ const PathBounds = {
3590
3601
 
3591
3602
  case O:
3592
3603
  arc(null, data[i + 1], data[i + 2], data[i + 3], data[i + 4], data[i + 5], data[i + 6], tempPointBounds, setEndPoint);
3593
- i === 0 ? copy$7(setPointBounds, tempPointBounds) : addPointBounds(setPointBounds, tempPointBounds);
3604
+ i === 0 ? copy$6(setPointBounds, tempPointBounds) : addPointBounds(setPointBounds, tempPointBounds);
3594
3605
  x = setEndPoint.x;
3595
3606
  y = setEndPoint.y;
3596
3607
  i += 7;
@@ -3607,7 +3618,7 @@ const PathBounds = {
3607
3618
 
3608
3619
  case U:
3609
3620
  arcTo$1(null, x, y, data[i + 1], data[i + 2], data[i + 3], data[i + 4], data[i + 5], tempPointBounds, setEndPoint);
3610
- i === 0 ? copy$7(setPointBounds, tempPointBounds) : addPointBounds(setPointBounds, tempPointBounds);
3621
+ i === 0 ? copy$6(setPointBounds, tempPointBounds) : addPointBounds(setPointBounds, tempPointBounds);
3611
3622
  x = setEndPoint.x;
3612
3623
  y = setEndPoint.y;
3613
3624
  i += 6;
@@ -3631,6 +3642,7 @@ const PathCorner = {
3631
3642
  smooth(data, cornerRadius, _cornerSmoothing) {
3632
3643
  let command, lastCommand, commandLen;
3633
3644
  let i = 0, x = 0, y = 0, startX = 0, startY = 0, secondX = 0, secondY = 0, lastX = 0, lastY = 0;
3645
+ if (isArray(cornerRadius)) cornerRadius = cornerRadius[0] || 0;
3634
3646
  const len = data.length;
3635
3647
  const smooth = [];
3636
3648
  while (i < len) {
@@ -4046,7 +4058,9 @@ const R = Resource;
4046
4058
  const ImageManager = {
4047
4059
  maxRecycled: 10,
4048
4060
  recycledList: [],
4049
- patternTasker: new TaskProcessor,
4061
+ patternTasker: new TaskProcessor({
4062
+ parallel: 1
4063
+ }),
4050
4064
  get(config) {
4051
4065
  let image = Resource.get(config.url);
4052
4066
  if (!image) Resource.set(config.url, image = Creator.image(config));
@@ -4627,7 +4641,7 @@ function registerUIEvent() {
4627
4641
  };
4628
4642
  }
4629
4643
 
4630
- const {copy: copy$6, toInnerPoint: toInnerPoint$1, toOuterPoint: toOuterPoint$1, scaleOfOuter: scaleOfOuter$2, rotateOfOuter: rotateOfOuter$2, skewOfOuter: skewOfOuter, multiplyParent: multiplyParent$3, divideParent: divideParent, getLayout: getLayout} = MatrixHelper;
4644
+ const {copy: copy$5, toInnerPoint: toInnerPoint$1, toOuterPoint: toOuterPoint$1, scaleOfOuter: scaleOfOuter$2, rotateOfOuter: rotateOfOuter$2, skewOfOuter: skewOfOuter, multiplyParent: multiplyParent$3, divideParent: divideParent, getLayout: getLayout} = MatrixHelper;
4631
4645
 
4632
4646
  const matrix$1 = {}, {round: round$3} = Math;
4633
4647
 
@@ -4725,7 +4739,7 @@ const LeafHelper = {
4725
4739
  if (scaleY) transition = scaleY;
4726
4740
  scaleY = scaleX;
4727
4741
  }
4728
- copy$6(matrix$1, o);
4742
+ copy$5(matrix$1, o);
4729
4743
  scaleOfOuter$2(matrix$1, origin, scaleX, scaleY);
4730
4744
  if (L$1.hasHighPosition(t)) {
4731
4745
  L$1.setTransform(t, matrix$1, resize, transition);
@@ -4744,7 +4758,7 @@ const LeafHelper = {
4744
4758
  },
4745
4759
  rotateOfLocal(t, origin, angle, transition) {
4746
4760
  const o = t.__localMatrix;
4747
- copy$6(matrix$1, o);
4761
+ copy$5(matrix$1, o);
4748
4762
  rotateOfOuter$2(matrix$1, origin, angle);
4749
4763
  if (L$1.hasHighPosition(t)) L$1.setTransform(t, matrix$1, false, transition); else t.set({
4750
4764
  x: t.x + matrix$1.e - o.e,
@@ -4756,18 +4770,18 @@ const LeafHelper = {
4756
4770
  L$1.skewOfLocal(t, getTempLocal(t, origin), skewX, skewY, resize, transition);
4757
4771
  },
4758
4772
  skewOfLocal(t, origin, skewX, skewY = 0, resize, transition) {
4759
- copy$6(matrix$1, t.__localMatrix);
4773
+ copy$5(matrix$1, t.__localMatrix);
4760
4774
  skewOfOuter(matrix$1, origin, skewX, skewY);
4761
4775
  L$1.setTransform(t, matrix$1, resize, transition);
4762
4776
  },
4763
4777
  transformWorld(t, transform, resize, transition) {
4764
- copy$6(matrix$1, t.worldTransform);
4778
+ copy$5(matrix$1, t.worldTransform);
4765
4779
  multiplyParent$3(matrix$1, transform);
4766
4780
  if (t.parent) divideParent(matrix$1, t.parent.scrollWorldTransform);
4767
4781
  L$1.setTransform(t, matrix$1, resize, transition);
4768
4782
  },
4769
4783
  transform(t, transform, resize, transition) {
4770
- copy$6(matrix$1, t.localTransform);
4784
+ copy$5(matrix$1, t.localTransform);
4771
4785
  multiplyParent$3(matrix$1, transform);
4772
4786
  L$1.setTransform(t, matrix$1, resize, transition);
4773
4787
  },
@@ -4805,7 +4819,7 @@ const LeafHelper = {
4805
4819
  return innerOrigin;
4806
4820
  },
4807
4821
  getRelativeWorld(t, relative, temp) {
4808
- copy$6(matrix$1, t.worldTransform);
4822
+ copy$5(matrix$1, t.worldTransform);
4809
4823
  divideParent(matrix$1, relative.scrollWorldTransform);
4810
4824
  return temp ? matrix$1 : Object.assign({}, matrix$1);
4811
4825
  },
@@ -5013,7 +5027,7 @@ const WaitHelper = {
5013
5027
 
5014
5028
  const {getRelativeWorld: getRelativeWorld$1, updateBounds: updateBounds$3} = LeafHelper;
5015
5029
 
5016
- const {toOuterOf: toOuterOf$3, getPoints: getPoints, copy: copy$5} = BoundsHelper;
5030
+ const {toOuterOf: toOuterOf$3, getPoints: getPoints, copy: copy$4} = BoundsHelper;
5017
5031
 
5018
5032
  const localContent = "_localContentBounds";
5019
5033
 
@@ -5252,7 +5266,7 @@ class LeafLayout {
5252
5266
  matrix = getRelativeWorld$1(leaf, relative, true);
5253
5267
  }
5254
5268
  if (!layoutBounds) layoutBounds = MatrixHelper.getLayout(matrix);
5255
- copy$5(layoutBounds, bounds);
5269
+ copy$4(layoutBounds, bounds);
5256
5270
  PointHelper.copy(layoutBounds, point);
5257
5271
  if (unscale) {
5258
5272
  const {scaleX: scaleX, scaleY: scaleY} = layoutBounds;
@@ -5874,7 +5888,7 @@ const LeafDataProxy = {
5874
5888
 
5875
5889
  const {setLayout: setLayout, multiplyParent: multiplyParent$2, translateInner: translateInner, defaultWorld: defaultWorld} = MatrixHelper;
5876
5890
 
5877
- const {toPoint: toPoint$3, tempPoint: tempPoint$1} = AroundHelper;
5891
+ const {toPoint: toPoint$3, tempPoint: tempPoint$2} = AroundHelper;
5878
5892
 
5879
5893
  const LeafMatrix = {
5880
5894
  __updateWorldMatrix() {
@@ -5894,8 +5908,8 @@ const LeafMatrix = {
5894
5908
  local.e = data.x + data.offsetX;
5895
5909
  local.f = data.y + data.offsetY;
5896
5910
  if (data.around || data.origin) {
5897
- toPoint$3(data.around || data.origin, layout.boxBounds, tempPoint$1);
5898
- translateInner(local, -tempPoint$1.x, -tempPoint$1.y, !data.around);
5911
+ toPoint$3(data.around || data.origin, layout.boxBounds, tempPoint$2);
5912
+ translateInner(local, -tempPoint$2.x, -tempPoint$2.y, !data.around);
5899
5913
  }
5900
5914
  }
5901
5915
  this.__layout.matrixChanged = undefined;
@@ -5906,7 +5920,7 @@ const {updateMatrix: updateMatrix$2, updateAllMatrix: updateAllMatrix$3} = LeafH
5906
5920
 
5907
5921
  const {updateBounds: updateBounds$2} = BranchHelper;
5908
5922
 
5909
- const {toOuterOf: toOuterOf$2, copyAndSpread: copyAndSpread$2, copy: copy$4} = BoundsHelper;
5923
+ const {toOuterOf: toOuterOf$2, copyAndSpread: copyAndSpread$2, copy: copy$3} = BoundsHelper;
5910
5924
 
5911
5925
  const {toBounds: toBounds} = PathBounds;
5912
5926
 
@@ -6017,7 +6031,7 @@ const LeafBounds = {
6017
6031
  },
6018
6032
  __updateRenderBounds(_bounds) {
6019
6033
  const layout = this.__layout, {renderSpread: renderSpread} = layout;
6020
- isNumber(renderSpread) && renderSpread <= 0 ? copy$4(layout.renderBounds, layout.strokeBounds) : copyAndSpread$2(layout.renderBounds, layout.boxBounds, renderSpread);
6034
+ isNumber(renderSpread) && renderSpread <= 0 ? copy$3(layout.renderBounds, layout.strokeBounds) : copyAndSpread$2(layout.renderBounds, layout.boxBounds, renderSpread);
6021
6035
  }
6022
6036
  };
6023
6037
 
@@ -6122,7 +6136,7 @@ const {toInnerPoint: toInnerPoint, toOuterPoint: toOuterPoint, multiplyParent: m
6122
6136
 
6123
6137
  const {toOuterOf: toOuterOf$1} = BoundsHelper;
6124
6138
 
6125
- const {copy: copy$3, move: move$2} = PointHelper;
6139
+ const {copy: copy$2, move: move$2} = PointHelper;
6126
6140
 
6127
6141
  const {moveLocal: moveLocal, zoomOfLocal: zoomOfLocal, rotateOfLocal: rotateOfLocal, skewOfLocal: skewOfLocal, moveWorld: moveWorld, zoomOfWorld: zoomOfWorld, rotateOfWorld: rotateOfWorld, skewOfWorld: skewOfWorld, transform: transform, transformWorld: transformWorld, setTransform: setTransform, getFlipTransform: getFlipTransform, getLocalOrigin: getLocalOrigin, getRelativeWorld: getRelativeWorld, drop: drop} = LeafHelper;
6128
6142
 
@@ -6441,14 +6455,14 @@ let Leaf = class Leaf {
6441
6455
  if (this.parent) {
6442
6456
  this.parent.worldToInner(world, to, distance, relative);
6443
6457
  } else {
6444
- if (to) copy$3(to, world);
6458
+ if (to) copy$2(to, world);
6445
6459
  }
6446
6460
  }
6447
6461
  localToWorld(local, to, distance, relative) {
6448
6462
  if (this.parent) {
6449
6463
  this.parent.innerToWorld(local, to, distance, relative);
6450
6464
  } else {
6451
- if (to) copy$3(to, local);
6465
+ if (to) copy$2(to, local);
6452
6466
  }
6453
6467
  }
6454
6468
  worldToInner(world, to, distance, relative) {
@@ -6923,7 +6937,7 @@ class LeafLevelList {
6923
6937
  }
6924
6938
  }
6925
6939
 
6926
- const version = "1.12.1";
6940
+ const version = "1.12.2";
6927
6941
 
6928
6942
  class LeaferCanvas extends LeaferCanvasBase {
6929
6943
  get allowBackgroundColor() {
@@ -7572,6 +7586,10 @@ class Renderer {
7572
7586
 
7573
7587
  Renderer.clipSpread = 10;
7574
7588
 
7589
+ const tempPoint$1 = {};
7590
+
7591
+ const {copyRadiusPoint: copyRadiusPoint$1} = PointHelper;
7592
+
7575
7593
  const {hitRadiusPoint: hitRadiusPoint$1} = BoundsHelper;
7576
7594
 
7577
7595
  class Picker {
@@ -7698,15 +7716,15 @@ class Picker {
7698
7716
  this.eachFind(branch.children, branch.__onlyHitMask);
7699
7717
  }
7700
7718
  eachFind(children, hitMask) {
7701
- let child, hit;
7719
+ let child, hit, data;
7702
7720
  const {point: point} = this, len = children.length;
7703
7721
  for (let i = len - 1; i > -1; i--) {
7704
- child = children[i];
7705
- if (!child.__.visible || hitMask && !child.__.mask) continue;
7706
- hit = child.__.hitRadius ? true : hitRadiusPoint$1(child.__world, point);
7722
+ child = children[i], data = child.__;
7723
+ if (!data.visible || hitMask && !data.mask) continue;
7724
+ hit = hitRadiusPoint$1(child.__world, data.hitRadius ? copyRadiusPoint$1(tempPoint$1, point, data.hitRadius) : point);
7707
7725
  if (child.isBranch) {
7708
7726
  if (hit || child.__ignoreHitWorld) {
7709
- if (child.isBranchLeaf && child.__.__clipAfterFill && !child.__hitWorld(point, true)) continue;
7727
+ if (child.isBranchLeaf && data.__clipAfterFill && !child.__hitWorld(point, true)) continue;
7710
7728
  if (child.topChildren) this.eachFind(child.topChildren, false);
7711
7729
  this.eachFind(child.children, child.__onlyHitMask);
7712
7730
  if (child.isBranchLeaf) this.hitChild(child, point);
@@ -8283,7 +8301,7 @@ const UIRender = {
8283
8301
  if (stroke && !__fillAfterStroke) data.__isStrokes ? Paint.strokes(stroke, this, canvas, options) : Paint.stroke(stroke, this, canvas, options);
8284
8302
  }
8285
8303
  } else {
8286
- if (data.__pathInputed) drawFast(this, canvas, options); else this.__drawFast(canvas, options);
8304
+ if (data.__pathForRender) drawFast(this, canvas, options); else this.__drawFast(canvas, options);
8287
8305
  }
8288
8306
  },
8289
8307
  __drawShape(canvas, options) {
@@ -8407,7 +8425,7 @@ let UI = UI_1 = class UI extends Leaf {
8407
8425
  getPath(curve, pathForRender) {
8408
8426
  this.__layout.update();
8409
8427
  let path = pathForRender ? this.__.__pathForRender : this.__.path;
8410
- if (!path) pen.set(path = []), this.__drawPathByBox(pen);
8428
+ if (!path) pen.set(path = []), this.__drawPathByBox(pen, !pathForRender);
8411
8429
  return curve ? PathConvert.toCanvasData(path, true) : path;
8412
8430
  }
8413
8431
  getPathString(curve, pathForRender, floatLength) {
@@ -8435,17 +8453,18 @@ let UI = UI_1 = class UI extends Leaf {
8435
8453
  }
8436
8454
  __drawPath(canvas) {
8437
8455
  canvas.beginPath();
8438
- this.__drawPathByData(canvas, this.__.path);
8456
+ this.__drawPathByData(canvas, this.__.path, true);
8439
8457
  }
8440
- __drawPathByData(drawer, data) {
8441
- data ? PathDrawer.drawPathByData(drawer, data) : this.__drawPathByBox(drawer);
8458
+ __drawPathByData(drawer, data, ignoreCornerRadius) {
8459
+ data ? PathDrawer.drawPathByData(drawer, data) : this.__drawPathByBox(drawer, ignoreCornerRadius);
8442
8460
  }
8443
- __drawPathByBox(drawer) {
8461
+ __drawPathByBox(drawer, ignoreCornerRadius) {
8444
8462
  const {x: x, y: y, width: width, height: height} = this.__layout.boxBounds;
8445
- if (this.__.cornerRadius) {
8463
+ if (this.__.cornerRadius && !ignoreCornerRadius) {
8446
8464
  const {cornerRadius: cornerRadius} = this.__;
8447
8465
  drawer.roundRect(x, y, width, height, isNumber(cornerRadius) ? [ cornerRadius ] : cornerRadius);
8448
8466
  } else drawer.rect(x, y, width, height);
8467
+ drawer.closePath();
8449
8468
  }
8450
8469
  drawImagePlaceholder(_paint, canvas, renderOptions) {
8451
8470
  Paint.fill(this.__.placeholderColor, this, canvas, renderOptions);
@@ -8714,6 +8733,9 @@ let Leafer = Leafer_1 = class Leafer extends Group {
8714
8733
  get layoutLocked() {
8715
8734
  return !this.layouter.running;
8716
8735
  }
8736
+ get view() {
8737
+ return this.canvas && this.canvas.view;
8738
+ }
8717
8739
  get FPS() {
8718
8740
  return this.renderer ? this.renderer.FPS : 60;
8719
8741
  }
@@ -8765,7 +8787,6 @@ let Leafer = Leafer_1 = class Leafer extends Group {
8765
8787
  this.__controllers.push(this.renderer = Creator.renderer(this, canvas, config), this.watcher = Creator.watcher(this, config), this.layouter = Creator.layouter(this, config));
8766
8788
  if (this.isApp) this.__setApp();
8767
8789
  this.__checkAutoLayout();
8768
- this.view = canvas.view;
8769
8790
  if (!parentApp) {
8770
8791
  this.selector = Creator.selector(this);
8771
8792
  this.interaction = Creator.interaction(this, canvas, this.selector, config);
@@ -9045,7 +9066,7 @@ let Leafer = Leafer_1 = class Leafer extends Group {
9045
9066
  if (this.canvasManager) this.canvasManager.destroy();
9046
9067
  }
9047
9068
  if (this.canvas) this.canvas.destroy();
9048
- this.config.view = this.view = this.parentApp = null;
9069
+ this.config.view = this.parentApp = null;
9049
9070
  if (this.userConfig) this.userConfig.view = null;
9050
9071
  super.destroy();
9051
9072
  setTimeout(() => {
@@ -9229,7 +9250,6 @@ let Ellipse = class Ellipse extends UI {
9229
9250
  if (startAngle || endAngle) {
9230
9251
  if (innerRadius < 1) ellipse(path, rx, ry, rx * innerRadius, ry * innerRadius, 0, startAngle, endAngle, false);
9231
9252
  ellipse(path, rx, ry, rx, ry, 0, endAngle, startAngle, true);
9232
- if (innerRadius < 1) closePath$2(path);
9233
9253
  } else {
9234
9254
  if (innerRadius < 1) {
9235
9255
  ellipse(path, rx, ry, rx * innerRadius, ry * innerRadius);
@@ -9237,16 +9257,16 @@ let Ellipse = class Ellipse extends UI {
9237
9257
  }
9238
9258
  ellipse(path, rx, ry, rx, ry, 0, 360, 0, true);
9239
9259
  }
9240
- if (Platform.ellipseToCurve) this.__.path = this.getPath(true);
9241
9260
  } else {
9242
9261
  if (startAngle || endAngle) {
9243
9262
  moveTo$3(path, rx, ry);
9244
9263
  ellipse(path, rx, ry, rx, ry, 0, startAngle, endAngle, false);
9245
- closePath$2(path);
9246
9264
  } else {
9247
9265
  ellipse(path, rx, ry, rx, ry);
9248
9266
  }
9249
9267
  }
9268
+ closePath$2(path);
9269
+ if (Platform.ellipseToCurve) this.__.path = this.getPath(true);
9250
9270
  }
9251
9271
  };
9252
9272
 
@@ -9897,7 +9917,7 @@ class UIEvent extends Event {
9897
9917
  }
9898
9918
  }
9899
9919
 
9900
- const {min: min, max: max$1, abs: abs$3} = Math, {float: float$1, sign: sign} = MathHelper, {minX: minX, maxX: maxX, minY: minY, maxY: maxY} = BoundsHelper;
9920
+ const {min: min, max: max$1, abs: abs$3} = Math, {float: float$2, sign: sign} = MathHelper, {minX: minX, maxX: maxX, minY: minY, maxY: maxY} = BoundsHelper;
9901
9921
 
9902
9922
  const tempContent = new Bounds, tempDragBounds = new Bounds;
9903
9923
 
@@ -9937,8 +9957,8 @@ const DragBoundsHelper = {
9937
9957
  } else {
9938
9958
  if (y < dragBounds.y) move.y += dragBounds.y - y; else if (bottom > boundsBottom) move.y += boundsBottom - bottom;
9939
9959
  }
9940
- move.x = float$1(move.x);
9941
- move.y = float$1(move.y);
9960
+ move.x = float$2(move.x);
9961
+ move.y = float$2(move.y);
9942
9962
  return move;
9943
9963
  },
9944
9964
  getValidScaleOf(content, dragBounds, dragBoundsType, origin, scale, lockRatio, change) {
@@ -9950,26 +9970,26 @@ const DragBoundsHelper = {
9950
9970
  let correctScaleX = 1, correctScaleY = 1, aScale, bScale, aSize, bSize;
9951
9971
  if (D.isInnerMode(content, dragBounds, dragBoundsType, "width")) {
9952
9972
  if (scale.x < 0) tempContent.scaleOf(origin, correctScaleX = 1 / scale.x, 1);
9953
- aSize = float$1(tempContent.minX - tempDragBounds.minX);
9954
- bSize = float$1(tempDragBounds.maxX - tempContent.maxX);
9973
+ aSize = float$2(tempContent.minX - tempDragBounds.minX);
9974
+ bSize = float$2(tempDragBounds.maxX - tempContent.maxX);
9955
9975
  aScale = originLeftScale && aSize > 0 ? 1 + aSize / (originLeftScale * tempContent.width) : 1;
9956
9976
  bScale = originRightScale && bSize > 0 ? 1 + bSize / (originRightScale * tempContent.width) : 1;
9957
9977
  correctScaleX *= max$1(aScale, bScale);
9958
9978
  } else {
9959
9979
  if (scale.x < 0) {
9960
- if (float$1(minX(content) - minX(dragBounds)) <= 0 || float$1(maxX(dragBounds) - maxX(content)) <= 0) tempContent.scaleOf(origin, correctScaleX = 1 / scale.x, 1);
9980
+ if (float$2(minX(content) - minX(dragBounds)) <= 0 || float$2(maxX(dragBounds) - maxX(content)) <= 0) tempContent.scaleOf(origin, correctScaleX = 1 / scale.x, 1);
9961
9981
  tempContent.unsign();
9962
9982
  }
9963
- aSize = float$1(tempDragBounds.minX - tempContent.minX);
9964
- bSize = float$1(tempContent.maxX - tempDragBounds.maxX);
9983
+ aSize = float$2(tempDragBounds.minX - tempContent.minX);
9984
+ bSize = float$2(tempContent.maxX - tempDragBounds.maxX);
9965
9985
  aScale = originLeftScale && aSize > 0 ? 1 - aSize / (originLeftScale * tempContent.width) : 1;
9966
9986
  bScale = originRightScale && bSize > 0 ? 1 - bSize / (originRightScale * tempContent.width) : 1;
9967
9987
  correctScaleX *= min(aScale, bScale);
9968
9988
  }
9969
9989
  if (D.isInnerMode(content, dragBounds, dragBoundsType, "height")) {
9970
9990
  if (scale.y < 0) tempContent.scaleOf(origin, 1, correctScaleY = 1 / scale.y);
9971
- aSize = float$1(tempContent.minY - tempDragBounds.minY);
9972
- bSize = float$1(tempDragBounds.maxY - tempContent.maxY);
9991
+ aSize = float$2(tempContent.minY - tempDragBounds.minY);
9992
+ bSize = float$2(tempDragBounds.maxY - tempContent.maxY);
9973
9993
  aScale = originTopScale && aSize > 0 ? 1 + aSize / (originTopScale * tempContent.height) : 1;
9974
9994
  bScale = originBottomScale && bSize > 0 ? 1 + bSize / (originBottomScale * tempContent.height) : 1;
9975
9995
  correctScaleY *= max$1(aScale, bScale);
@@ -9980,11 +10000,11 @@ const DragBoundsHelper = {
9980
10000
  }
9981
10001
  } else {
9982
10002
  if (scale.y < 0) {
9983
- if (float$1(minY(content) - minY(dragBounds)) <= 0 || float$1(maxY(dragBounds) - maxY(content)) <= 0) tempContent.scaleOf(origin, 1, correctScaleY = 1 / scale.y);
10003
+ if (float$2(minY(content) - minY(dragBounds)) <= 0 || float$2(maxY(dragBounds) - maxY(content)) <= 0) tempContent.scaleOf(origin, 1, correctScaleY = 1 / scale.y);
9984
10004
  tempContent.unsign();
9985
10005
  }
9986
- aSize = float$1(tempDragBounds.minY - tempContent.minY);
9987
- bSize = float$1(tempContent.maxY - tempDragBounds.maxY);
10006
+ aSize = float$2(tempDragBounds.minY - tempContent.minY);
10007
+ bSize = float$2(tempContent.maxY - tempDragBounds.maxY);
9988
10008
  aScale = originTopScale && aSize > 0 ? 1 - aSize / (originTopScale * tempContent.height) : 1;
9989
10009
  bScale = originBottomScale && bSize > 0 ? 1 - bSize / (originBottomScale * tempContent.height) : 1;
9990
10010
  correctScaleY *= min(aScale, bScale);
@@ -10136,6 +10156,8 @@ MoveEvent.START = "move.start";
10136
10156
 
10137
10157
  MoveEvent.MOVE = "move";
10138
10158
 
10159
+ MoveEvent.DRAG_ANIMATE = "move.drag_animate";
10160
+
10139
10161
  MoveEvent.END = "move.end";
10140
10162
 
10141
10163
  MoveEvent = __decorate([ registerUIEvent() ], MoveEvent);
@@ -10234,6 +10256,7 @@ const InteractionHelper = {
10234
10256
  ctrlKey: e.ctrlKey,
10235
10257
  shiftKey: e.shiftKey,
10236
10258
  metaKey: e.metaKey,
10259
+ time: Date.now(),
10237
10260
  buttons: isUndefined(e.buttons) ? 1 : e.buttons === 0 ? pointerUpButtons : e.buttons,
10238
10261
  origin: e
10239
10262
  };
@@ -10269,6 +10292,7 @@ const {getDragEventData: getDragEventData, getDropEventData: getDropEventData, g
10269
10292
 
10270
10293
  class Dragger {
10271
10294
  constructor(interaction) {
10295
+ this.dragDataList = [];
10272
10296
  this.interaction = interaction;
10273
10297
  }
10274
10298
  setDragData(data) {
@@ -10331,6 +10355,7 @@ class Dragger {
10331
10355
  this.dragData = getDragEventData(downData, dragData, data);
10332
10356
  if (throughPath) this.dragData.throughPath = throughPath;
10333
10357
  this.dragData.path = path;
10358
+ this.dragDataList.push(this.dragData);
10334
10359
  if (this.moving) {
10335
10360
  data.moving = true;
10336
10361
  this.dragData.moveType = "drag";
@@ -10381,9 +10406,9 @@ class Dragger {
10381
10406
  interaction.emit(DragEvent.ENTER, data, path, dragEnterPath);
10382
10407
  this.dragEnterPath = path;
10383
10408
  }
10384
- dragEnd(data, speed) {
10409
+ dragEnd(data) {
10385
10410
  if (!this.dragging && !this.moving) return;
10386
- if (this.checkDragEndAnimate(data, speed)) return;
10411
+ if (this.checkDragEndAnimate(data)) return;
10387
10412
  this.dragEndReal(data);
10388
10413
  }
10389
10414
  dragEndReal(data) {
@@ -10425,11 +10450,13 @@ class Dragger {
10425
10450
  }
10426
10451
  dragReset() {
10427
10452
  DragEvent.list = DragEvent.data = this.draggableList = this.dragData = this.downData = this.dragOverPath = this.dragEnterPath = null;
10453
+ this.dragDataList = [];
10428
10454
  }
10429
10455
  checkDragEndAnimate(_data, _speed) {
10430
10456
  return false;
10431
10457
  }
10432
10458
  animate(_func, _off) {}
10459
+ stopAnimate() {}
10433
10460
  checkDragOut(_data) {}
10434
10461
  autoMoveOnDragOut(_data) {}
10435
10462
  autoMoveCancel() {}
@@ -10823,6 +10850,9 @@ class InteractionBase {
10823
10850
  this.pointerHover(hoverData);
10824
10851
  }
10825
10852
  }
10853
+ stopDragAnimate() {
10854
+ this.dragger.stopAnimate();
10855
+ }
10826
10856
  updateDownData(data, options, merge) {
10827
10857
  const {downData: downData} = this;
10828
10858
  if (!data && downData) data = downData;
@@ -11006,7 +11036,7 @@ Platform.getSelector = function(leaf) {
11006
11036
  return leaf.leafer ? leaf.leafer.selector : Platform.selector || (Platform.selector = Creator.selector());
11007
11037
  };
11008
11038
 
11009
- const {toInnerRadiusPointOf: toInnerRadiusPointOf, copy: copy$2, setRadius: setRadius} = PointHelper;
11039
+ const {toInnerRadiusPointOf: toInnerRadiusPointOf, copyRadiusPoint: copyRadiusPoint} = PointHelper;
11010
11040
 
11011
11041
  const {hitRadiusPoint: hitRadiusPoint, hitPoint: hitPoint} = BoundsHelper;
11012
11042
 
@@ -11016,8 +11046,7 @@ const leaf = Leaf.prototype;
11016
11046
 
11017
11047
  leaf.hit = function(worldPoint, hitRadius = 0) {
11018
11048
  this.updateLayout();
11019
- copy$2(worldRadiusPoint, worldPoint);
11020
- setRadius(worldRadiusPoint, hitRadius);
11049
+ copyRadiusPoint(worldRadiusPoint, worldPoint, hitRadius);
11021
11050
  const world = this.__world;
11022
11051
  if (hitRadius ? !hitRadiusPoint(world, worldRadiusPoint) : !hitPoint(world, worldRadiusPoint)) return false;
11023
11052
  return this.isBranch ? Platform.getSelector(this).hitPoint(Object.assign({}, worldRadiusPoint), hitRadius, {
@@ -11031,8 +11060,8 @@ leaf.__hitWorld = function(point, forceHitFill) {
11031
11060
  const world = this.__world, layout = this.__layout;
11032
11061
  const isSmall = world.width < 10 && world.height < 10;
11033
11062
  if (data.hitRadius) {
11034
- copy$2(inner, point), point = inner;
11035
- setRadius(point, data.hitRadius);
11063
+ copyRadiusPoint(inner, point, data.hitRadius);
11064
+ point = inner;
11036
11065
  }
11037
11066
  toInnerRadiusPointOf(point, world, inner);
11038
11067
  if (data.hitBox || isSmall) {
@@ -11840,10 +11869,12 @@ const {getFloorScale: getFloorScale} = MathHelper, {abs: abs$2} = Math;
11840
11869
  function createPatternTask(paint, ui, canvas, renderOptions) {
11841
11870
  if (!paint.patternTask) {
11842
11871
  paint.patternTask = ImageManager.patternTasker.add(() => __awaiter(this, void 0, void 0, function*() {
11843
- paint.patternTask = null;
11844
- if (canvas.bounds.hit(ui.__nowWorld)) PaintImage.createPattern(paint, ui, canvas, renderOptions);
11872
+ PaintImage.createPattern(paint, ui, canvas, renderOptions);
11845
11873
  ui.forceUpdate("surface");
11846
- }), 300);
11874
+ }), 0, () => {
11875
+ paint.patternTask = null;
11876
+ return canvas.bounds.hit(ui.__nowWorld);
11877
+ });
11847
11878
  }
11848
11879
  }
11849
11880
 
@@ -13572,6 +13603,8 @@ let Animate = class Animate extends Eventer {
13572
13603
  }
13573
13604
  constructor(target, keyframe, options, isTemp) {
13574
13605
  super();
13606
+ this.nowIndex = 0;
13607
+ this.playedTotalTime = 0;
13575
13608
  if (keyframe) {
13576
13609
  if (keyframe.keyframes) options = keyframe, keyframe = keyframe.keyframes; else if (keyframe.style) options = keyframe,
13577
13610
  keyframe = keyframe.style;
@@ -13618,7 +13651,7 @@ let Animate = class Animate extends Eventer {
13618
13651
  play() {
13619
13652
  if (this.destroyed) return;
13620
13653
  this.running = true;
13621
- if (!this.started) this.clearTimer(), this.start(); else if (!this.timer) this.requestAnimate();
13654
+ if (!this.started) this.clearTimer(), this.start(); else if (!this.timer) this.startRequestAnimate();
13622
13655
  this.emitType(AnimateEvent.PLAY);
13623
13656
  }
13624
13657
  pause() {
@@ -13632,14 +13665,28 @@ let Animate = class Animate extends Eventer {
13632
13665
  this.complete();
13633
13666
  this.emitType(AnimateEvent.STOP);
13634
13667
  }
13635
- seek(time) {
13668
+ seek(time, includeDelay) {
13636
13669
  if (this.destroyed) return;
13637
- if (isObject(time)) time = UnitConvert.number(time, this.duration);
13670
+ const {delay: delay} = this;
13671
+ if (isObject(time)) time = UnitConvert.number(time, this.duration + (includeDelay ? delay : 0));
13672
+ if (includeDelay) time -= delay;
13638
13673
  if (time) time /= this.speed;
13639
- if (!this.started || time < this.time) this.start(true);
13674
+ let waitBeginTime;
13675
+ if (time < 0) {
13676
+ waitBeginTime = -time;
13677
+ time = 0;
13678
+ }
13679
+ if (!this.started || time < this.time || !time) this.start(true);
13640
13680
  this.time = time;
13641
- this.animate(0, true);
13642
- this.clearTimer(() => this.requestAnimate());
13681
+ if (!waitBeginTime) this.animate(0, true);
13682
+ this.clearTimer(() => {
13683
+ if (waitBeginTime) {
13684
+ this.timer = setTimeout(() => {
13685
+ this.timer = 0;
13686
+ this.begin();
13687
+ }, waitBeginTime * 1e3);
13688
+ } else this.startRequestAnimate();
13689
+ });
13643
13690
  this.emitType(AnimateEvent.SEEK);
13644
13691
  }
13645
13692
  kill(complete = true, killStyle) {
@@ -13722,14 +13769,24 @@ let Animate = class Animate extends Eventer {
13722
13769
  }
13723
13770
  }
13724
13771
  }
13725
- requestAnimate() {
13772
+ startRequestAnimate() {
13726
13773
  this.requestAnimateTime = Date.now();
13774
+ this.requestAnimatePageTime = 0;
13775
+ if (!this.waitRequestRender) this.requestAnimate();
13776
+ }
13777
+ requestAnimate() {
13778
+ this.waitRequestRender = true;
13727
13779
  Platform.requestRender(this.animate.bind(this));
13728
13780
  }
13729
- animate(_runtime, seek) {
13781
+ animate(pageTime, seek) {
13730
13782
  if (!seek) {
13783
+ this.waitRequestRender = false;
13731
13784
  if (!this.running) return;
13732
- this.time += (Date.now() - this.requestAnimateTime) / 1e3;
13785
+ let frameTime;
13786
+ if (pageTime && this.requestAnimatePageTime) frameTime = pageTime - this.requestAnimatePageTime; else frameTime = Date.now() - this.requestAnimateTime;
13787
+ this.time += frameTime / 1e3;
13788
+ this.requestAnimatePageTime = pageTime;
13789
+ this.requestAnimateTime = Date.now();
13733
13790
  }
13734
13791
  const {duration: duration} = this, realTime = this.time * this.speed;
13735
13792
  if (realTime < duration) {
@@ -13770,21 +13827,24 @@ let Animate = class Animate extends Eventer {
13770
13827
  }
13771
13828
  start(seek) {
13772
13829
  this.requestAnimateTime = 1;
13773
- const {reverse: reverse} = this;
13830
+ const {reverse: reverse, jump: jump} = this;
13774
13831
  if (reverse || this.mainReverse) this.mainReverse = reverse;
13775
13832
  if (this.looped) this.looped = 0;
13776
13833
  if (seek) this.begin(true); else {
13777
13834
  const {delay: delay} = this;
13778
- if (delay) this.timer = setTimeout(() => {
13779
- this.timer = 0;
13780
- this.begin();
13781
- }, delay / this.speed * 1e3); else this.begin();
13835
+ if (delay) {
13836
+ if (jump) this.begin(true);
13837
+ this.timer = setTimeout(() => {
13838
+ this.timer = 0;
13839
+ this.begin();
13840
+ }, delay / this.speed * 1e3);
13841
+ } else this.begin();
13782
13842
  }
13783
13843
  }
13784
13844
  begin(seek) {
13785
13845
  this.playedTotalTime = this.time = 0;
13786
13846
  this.mainReverse ? this.setTo() : this.setFrom();
13787
- if (!seek) this.requestAnimate();
13847
+ if (!seek) this.startRequestAnimate();
13788
13848
  }
13789
13849
  end() {
13790
13850
  this.mainReverse ? this.setFrom() : this.setTo();
@@ -13900,6 +13960,8 @@ __decorate([ animateAttr(true) ], Animate.prototype, "autoplay", void 0);
13900
13960
 
13901
13961
  __decorate([ animateAttr() ], Animate.prototype, "join", void 0);
13902
13962
 
13963
+ __decorate([ animateAttr() ], Animate.prototype, "jump", void 0);
13964
+
13903
13965
  __decorate([ animateAttr() ], Animate.prototype, "attrs", void 0);
13904
13966
 
13905
13967
  Animate = __decorate([ useModule(LeafEventer) ], Animate);
@@ -14138,7 +14200,7 @@ const hslMatch = /^hsl\((\d+),\s*(\d+)%\s*,\s*(\d+)%/i;
14138
14200
 
14139
14201
  const hslaMatch = /^hsla\((\d+),\s*(\d+)%\s*,\s*(\d+)%\s*,\s*(\d*\.?\d+)/i;
14140
14202
 
14141
- const int = parseInt, float = parseFloat, {round: round$1} = Math;
14203
+ const int = parseInt, float$1 = parseFloat, {round: round$1} = Math;
14142
14204
 
14143
14205
  let cache = {}, totalCache = 0;
14144
14206
 
@@ -14251,18 +14313,18 @@ function rgbaToRGBA(color) {
14251
14313
  r: int(match[1]),
14252
14314
  g: int(match[2]),
14253
14315
  b: int(match[3]),
14254
- a: float(match[4])
14316
+ a: float$1(match[4])
14255
14317
  };
14256
14318
  }
14257
14319
 
14258
14320
  function hslToRGBA(color) {
14259
14321
  const match = hslMatch.exec(color);
14260
- return hsla(float(match[1]), float(match[2]), float(match[3]), 1);
14322
+ return hsla(float$1(match[1]), float$1(match[2]), float$1(match[3]), 1);
14261
14323
  }
14262
14324
 
14263
14325
  function hslaToRGBA(color) {
14264
14326
  const match = hslaMatch.exec(color);
14265
- return hsla(float(match[1]), float(match[2]), float(match[3]), float(match[4]));
14327
+ return hsla(float$1(match[1]), float$1(match[2]), float$1(match[3]), float$1(match[4]));
14266
14328
  }
14267
14329
 
14268
14330
  const n1 = 1 / 6, n2 = .5, n3 = 2 / 3, n4 = 1 / 3;
@@ -14501,7 +14563,7 @@ const HighBezierHelper = {
14501
14563
 
14502
14564
  const {getDistance: getDistance} = HighBezierHelper;
14503
14565
 
14504
- const {M: M, L: L, C: C, Z: Z} = PathCommandMap;
14566
+ const {M: M, L: L, C: C, Z: Z} = PathCommandMap, {float: float} = MathHelper;
14505
14567
 
14506
14568
  const tempPoint = {}, tempFrom = {};
14507
14569
 
@@ -14638,7 +14700,7 @@ const HighCurveHelper = {
14638
14700
  getDistancePath(distanceData, motionDistance, motionPrecision) {
14639
14701
  const {segments: segments, data: data} = distanceData, path = [];
14640
14702
  motionDistance = UnitConvert.number(motionDistance, distanceData.total);
14641
- let total = 0, distance, to = {};
14703
+ let total = 0, distance, cutDistance, to = {};
14642
14704
  let i = 0, index = 0, x = 0, y = 0, toX, toY, command;
14643
14705
  let x1, y1, x2, y2, t;
14644
14706
  const len = data.length;
@@ -14650,14 +14712,17 @@ const HighCurveHelper = {
14650
14712
  toX = data[i + 1];
14651
14713
  toY = data[i + 2];
14652
14714
  distance = segments[index];
14653
- if (total + distance >= motionDistance || !distanceData.total) {
14715
+ if (total + distance > motionDistance || !distanceData.total) {
14654
14716
  if (!i) x = toX, y = toY;
14655
14717
  tempFrom.x = x;
14656
14718
  tempFrom.y = y;
14657
14719
  to.x = toX;
14658
14720
  to.y = toY;
14659
- PointHelper.getDistancePoint(tempFrom, to, motionDistance - total, true);
14660
- path.push(command, to.x, to.y);
14721
+ cutDistance = float(motionDistance - total);
14722
+ if (cutDistance) {
14723
+ PointHelper.getDistancePoint(tempFrom, to, cutDistance, true);
14724
+ path.push(command, to.x, to.y);
14725
+ }
14661
14726
  return path;
14662
14727
  }
14663
14728
  x = toX;
@@ -14671,9 +14736,12 @@ const HighCurveHelper = {
14671
14736
  toX = data[i + 5];
14672
14737
  toY = data[i + 6];
14673
14738
  distance = segments[index];
14674
- if (total + distance >= motionDistance) {
14675
- t = HighBezierHelper.getT(motionDistance - total, distance, x, y, x1, y1, x2, y2, toX, toY, motionPrecision);
14676
- HighBezierHelper.cut(path, t, x, y, x1, y1, x2, y2, toX, toY);
14739
+ if (total + distance > motionDistance) {
14740
+ cutDistance = float(motionDistance - total);
14741
+ if (cutDistance) {
14742
+ t = HighBezierHelper.getT(cutDistance, distance, x, y, x1, y1, x2, y2, toX, toY, motionPrecision);
14743
+ HighBezierHelper.cut(path, t, x, y, x1, y1, x2, y2, toX, toY);
14744
+ }
14677
14745
  return path;
14678
14746
  }
14679
14747
  x = toX;
@@ -14882,6 +14950,7 @@ class Finder {
14882
14950
  for (let i = 0, len = children.length; i < len; i++) {
14883
14951
  child = children[i];
14884
14952
  result = method(child, options);
14953
+ if (typeof result === "boolean") result = result ? 1 : 0;
14885
14954
  if (result === Yes || result === YesAndSkip) {
14886
14955
  if (list) {
14887
14956
  list.push(child);
@@ -14946,4 +15015,4 @@ Creator.finder = function(target) {
14946
15015
  return new Finder(target);
14947
15016
  };
14948
15017
 
14949
- export { AlignHelper, Animate, AnimateEasing, AnimateEvent, AnimateList, Answer, App, AroundHelper, AutoBounds, BezierHelper, Bounds, BoundsEvent, BoundsHelper, Box, BoxData, Branch, BranchHelper, BranchRender, Canvas, CanvasData, CanvasManager, ChildEvent, ColorConvert, Creator, Cursor, DataHelper, Debug, Direction4, Direction9, DragBoundsHelper, DragEvent, Dragger, DropEvent, Effect, Ellipse, EllipseData, EllipseHelper, Event, EventCreator, Eventer, Export, FileHelper, Filter, Finder, FourNumberHelper, Frame, FrameData, Group, GroupData, HighBezierHelper, HighCurveHelper, HitCanvasManager, Image, ImageData, ImageEvent, ImageManager, IncrementId, InteractionBase, InteractionHelper, KeyEvent, Keyboard, 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, MoveEvent, MyDragEvent, MyImage, MyPointerEvent, MyTouchEvent, NeedConvertToCanvasCommandMap, OneRadian, PI2, PI_2, Paint, PaintGradient, PaintImage, Path, PathArrow, PathBounds, PathCommandDataHelper, PathCommandMap, PathCommandNodeHelper, PathConvert, PathCorner, PathCreator, PathData, PathDrawer, PathHelper, PathNodeHandleType, PathNumberCommandLengthMap, PathNumberCommandMap, Pen, PenData, Picker, Platform, Plugin, Point, PointHelper, PointerButton, PointerEvent, Polygon, PolygonData, PropertyEvent, Rect, RectData, RectHelper, RectRender, RenderEvent, Renderer, ResizeEvent, Resource, Robot, RobotData, RotateEvent, Run, Selector, Star, StarData, State, StringNumberMap, SwipeEvent, TaskItem, TaskProcessor, Text, TextConvert, TextData, TouchEvent, Transition, TwoPointBoundsHelper, UI, UIBounds, UICreator, UIData, UIEvent, UIRender, UnitConvert, WaitHelper, WatchEvent, Watcher, ZoomEvent, affectRenderBoundsType, affectStrokeBoundsType, attr, autoLayoutType, boundsType, canvasPatch, canvasSizeAttrs, createAttr, createDescriptor, cursorType, dataProcessor, dataType, decorateLeafAttr, defineDataProcessor, defineKey, defineLeafAttr, dimType, doBoundsType, doStrokeType, effectType, emptyData, eraserType, extraPropertyEventMap, getBoundsData, getDescriptor, getMatrixData, getPointData, hitType, isArray, isData, isEmptyData, isFinite, isNull, isNumber, isObject, isString, isUndefined, layoutProcessor, leaferTransformAttrMap, maskType, motionPathType, naturalBoundsType, opacityType, path, pathInputType, pathType, pen, positionType, registerUI, registerUIEvent, resizeType, rewrite, rewriteAble, rotationType, scaleType, scrollType, sortType, stateStyleType, stateType, strokeType, surfaceType, tempBounds$2 as tempBounds, tempMatrix$2 as tempMatrix, tempPoint$3 as tempPoint, tryToNumber, useCanvas, useModule, version, visibleType, zoomLayerType };
15018
+ export { AlignHelper, Animate, AnimateEasing, AnimateEvent, AnimateList, Answer, App, AroundHelper, AutoBounds, BezierHelper, Bounds, BoundsEvent, BoundsHelper, Box, BoxData, Branch, BranchHelper, BranchRender, Canvas, CanvasData, CanvasManager, ChildEvent, ColorConvert, Creator, Cursor, DataHelper, Debug, Direction4, Direction9, DragBoundsHelper, DragEvent, Dragger, DropEvent, Effect, Ellipse, EllipseData, EllipseHelper, Event, EventCreator, Eventer, Export, FileHelper, Filter, Finder, FourNumberHelper, Frame, FrameData, Group, GroupData, HighBezierHelper, HighCurveHelper, HitCanvasManager, Image, ImageData, ImageEvent, ImageManager, IncrementId, InteractionBase, InteractionHelper, KeyEvent, Keyboard, 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, MoveEvent, MyDragEvent, MyImage, MyPointerEvent, MyTouchEvent, NeedConvertToCanvasCommandMap, OneRadian, PI2, PI_2, Paint, PaintGradient, PaintImage, Path, PathArrow, PathBounds, PathCommandDataHelper, PathCommandMap, PathCommandNodeHelper, PathConvert, PathCorner, PathCreator, PathData, PathDrawer, PathHelper, PathNodeHandleType, PathNumberCommandLengthMap, PathNumberCommandMap, Pen, PenData, Picker, Platform, Plugin, Point, PointHelper, PointerButton, PointerEvent, Polygon, PolygonData, PropertyEvent, Rect, RectData, RectHelper, RectRender, RenderEvent, Renderer, ResizeEvent, Resource, Robot, RobotData, RotateEvent, Run, Selector, Star, StarData, State, StringNumberMap, SwipeEvent, TaskItem, TaskProcessor, Text, TextConvert, TextData, TouchEvent, Transition, TwoPointBoundsHelper, UI, UIBounds, UICreator, UIData, UIEvent, UIRender, UnitConvert, WaitHelper, WatchEvent, Watcher, ZoomEvent, affectRenderBoundsType, affectStrokeBoundsType, attr, autoLayoutType, boundsType, canvasPatch, canvasSizeAttrs, createAttr, createDescriptor, cursorType, dataProcessor, dataType, decorateLeafAttr, defineDataProcessor, defineKey, defineLeafAttr, dimType, doBoundsType, doStrokeType, effectType, emptyData, eraserType, extraPropertyEventMap, getBoundsData, getDescriptor, getMatrixData, getPointData, hitType, isArray, isData, isEmptyData, isFinite, isNull, isNumber, isObject, isString, isUndefined, layoutProcessor, leaferTransformAttrMap, maskType, motionPathType, naturalBoundsType, opacityType, path, pathInputType, pathType, pen, positionType, registerUI, registerUIEvent, resizeType, rewrite, rewriteAble, rotationType, scaleType, scrollType, sortType, stateStyleType, stateType, strokeType, surfaceType, tempBounds$2 as tempBounds, tempMatrix$2 as tempMatrix, tempPoint$4 as tempPoint, tryToNumber, useCanvas, useModule, version, visibleType, zoomLayerType };