@leafer/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.
- package/dist/worker.js +297 -187
- package/dist/worker.min.js +1 -1
- package/dist/worker.min.js.map +1 -1
- package/dist/worker.module.js +304 -187
- package/dist/worker.module.min.js +1 -1
- package/dist/worker.module.min.js.map +1 -1
- package/package.json +23 -23
package/dist/worker.js
CHANGED
|
@@ -199,7 +199,7 @@ var LeaferUI = function(exports) {
|
|
|
199
199
|
this.__input = this.__middle = null;
|
|
200
200
|
}
|
|
201
201
|
}
|
|
202
|
-
const {floor: floor$3, max: max$
|
|
202
|
+
const {floor: floor$3, max: max$7} = Math;
|
|
203
203
|
const Platform = {
|
|
204
204
|
toURL(text, fileType) {
|
|
205
205
|
let url = encodeURIComponent(text);
|
|
@@ -224,7 +224,7 @@ var LeaferUI = function(exports) {
|
|
|
224
224
|
return url;
|
|
225
225
|
},
|
|
226
226
|
resize(image, width, height, xGap, yGap, clip, smooth, opacity, _filters) {
|
|
227
|
-
const canvas = Platform.origin.createCanvas(max$
|
|
227
|
+
const canvas = Platform.origin.createCanvas(max$7(floor$3(width + (xGap || 0)), 1), max$7(floor$3(height + (yGap || 0)), 1));
|
|
228
228
|
const ctx = canvas.getContext("2d");
|
|
229
229
|
if (opacity) ctx.globalAlpha = opacity;
|
|
230
230
|
ctx.imageSmoothingEnabled = smooth === false ? false : true;
|
|
@@ -266,7 +266,7 @@ var LeaferUI = function(exports) {
|
|
|
266
266
|
};
|
|
267
267
|
const I$2 = IncrementId;
|
|
268
268
|
let tempA, tempB, tempTo;
|
|
269
|
-
const {max: max$
|
|
269
|
+
const {max: max$6} = Math, tempFour = [ 0, 0, 0, 0 ];
|
|
270
270
|
const FourNumberHelper = {
|
|
271
271
|
zero: [ ...tempFour ],
|
|
272
272
|
tempFour: tempFour,
|
|
@@ -317,9 +317,9 @@ var LeaferUI = function(exports) {
|
|
|
317
317
|
return data;
|
|
318
318
|
},
|
|
319
319
|
max(t, other, change) {
|
|
320
|
-
if (isNumber(t) && isNumber(other)) return max$
|
|
320
|
+
if (isNumber(t) && isNumber(other)) return max$6(t, other);
|
|
321
321
|
toTempAB(t, other, change);
|
|
322
|
-
return set$2(tempTo, max$
|
|
322
|
+
return set$2(tempTo, max$6(tempA[0], tempB[0]), max$6(tempA[1], tempB[1]), max$6(tempA[2], tempB[2]), max$6(tempA[3], tempB[3]));
|
|
323
323
|
},
|
|
324
324
|
add(t, other, change) {
|
|
325
325
|
if (isNumber(t) && isNumber(other)) return t + other;
|
|
@@ -334,7 +334,7 @@ var LeaferUI = function(exports) {
|
|
|
334
334
|
}
|
|
335
335
|
};
|
|
336
336
|
const {set: set$2, get: get$5, setTemp: setTemp, toTempAB: toTempAB} = FourNumberHelper;
|
|
337
|
-
const {round: round$6, pow: pow$2, max: max$
|
|
337
|
+
const {round: round$6, pow: pow$2, max: max$5, floor: floor$2, PI: PI$4} = Math;
|
|
338
338
|
const MathHelper = {
|
|
339
339
|
within(value, min, max) {
|
|
340
340
|
if (isObject(min)) max = min.max, min = min.min;
|
|
@@ -387,7 +387,7 @@ var LeaferUI = function(exports) {
|
|
|
387
387
|
}
|
|
388
388
|
},
|
|
389
389
|
getFloorScale(num, min = 1) {
|
|
390
|
-
return max$
|
|
390
|
+
return max$5(floor$2(num), min) / num;
|
|
391
391
|
},
|
|
392
392
|
randInt: randInt,
|
|
393
393
|
randColor(opacity) {
|
|
@@ -425,8 +425,8 @@ var LeaferUI = function(exports) {
|
|
|
425
425
|
};
|
|
426
426
|
}
|
|
427
427
|
const {sin: sin$6, cos: cos$6, acos: acos, sqrt: sqrt$5} = Math;
|
|
428
|
-
const {float: float$
|
|
429
|
-
const tempPoint$
|
|
428
|
+
const {float: float$5} = MathHelper;
|
|
429
|
+
const tempPoint$5 = {};
|
|
430
430
|
function getWorld() {
|
|
431
431
|
return Object.assign(Object.assign(Object.assign({}, getMatrixData()), getBoundsData()), {
|
|
432
432
|
scaleX: 1,
|
|
@@ -483,8 +483,8 @@ var LeaferUI = function(exports) {
|
|
|
483
483
|
to.f = t.f * pixelRatio;
|
|
484
484
|
},
|
|
485
485
|
scaleOfOuter(t, origin, scaleX, scaleY) {
|
|
486
|
-
M$b.toInnerPoint(t, origin, tempPoint$
|
|
487
|
-
M$b.scaleOfInner(t, tempPoint$
|
|
486
|
+
M$b.toInnerPoint(t, origin, tempPoint$5);
|
|
487
|
+
M$b.scaleOfInner(t, tempPoint$5, scaleX, scaleY);
|
|
488
488
|
},
|
|
489
489
|
scaleOfInner(t, origin, scaleX, scaleY = scaleX) {
|
|
490
490
|
M$b.translateInner(t, origin.x, origin.y);
|
|
@@ -502,8 +502,8 @@ var LeaferUI = function(exports) {
|
|
|
502
502
|
t.d = c * sinR + d * cosR;
|
|
503
503
|
},
|
|
504
504
|
rotateOfOuter(t, origin, rotation) {
|
|
505
|
-
M$b.toInnerPoint(t, origin, tempPoint$
|
|
506
|
-
M$b.rotateOfInner(t, tempPoint$
|
|
505
|
+
M$b.toInnerPoint(t, origin, tempPoint$5);
|
|
506
|
+
M$b.rotateOfInner(t, tempPoint$5, rotation);
|
|
507
507
|
},
|
|
508
508
|
rotateOfInner(t, origin, rotation) {
|
|
509
509
|
M$b.translateInner(t, origin.x, origin.y);
|
|
@@ -524,8 +524,8 @@ var LeaferUI = function(exports) {
|
|
|
524
524
|
}
|
|
525
525
|
},
|
|
526
526
|
skewOfOuter(t, origin, skewX, skewY) {
|
|
527
|
-
M$b.toInnerPoint(t, origin, tempPoint$
|
|
528
|
-
M$b.skewOfInner(t, tempPoint$
|
|
527
|
+
M$b.toInnerPoint(t, origin, tempPoint$5);
|
|
528
|
+
M$b.skewOfInner(t, tempPoint$5, skewX, skewY);
|
|
529
529
|
},
|
|
530
530
|
skewOfInner(t, origin, skewX, skewY = 0) {
|
|
531
531
|
M$b.translateInner(t, origin.x, origin.y);
|
|
@@ -673,12 +673,12 @@ var LeaferUI = function(exports) {
|
|
|
673
673
|
const cosR = c / scaleY;
|
|
674
674
|
rotation = PI_2 - (d > 0 ? acos(-cosR) : -acos(cosR));
|
|
675
675
|
}
|
|
676
|
-
const cosR = float$
|
|
676
|
+
const cosR = float$5(cos$6(rotation));
|
|
677
677
|
const sinR = sin$6(rotation);
|
|
678
|
-
scaleX = float$
|
|
679
|
-
skewX = cosR ? float$
|
|
680
|
-
skewY = cosR ? float$
|
|
681
|
-
rotation = float$
|
|
678
|
+
scaleX = float$5(scaleX), scaleY = float$5(scaleY);
|
|
679
|
+
skewX = cosR ? float$5((c / scaleY + sinR) / cosR / OneRadian, 9) : 0;
|
|
680
|
+
skewY = cosR ? float$5((b / scaleX - sinR) / cosR / OneRadian, 9) : 0;
|
|
681
|
+
rotation = float$5(rotation / OneRadian);
|
|
682
682
|
} else {
|
|
683
683
|
scaleX = a;
|
|
684
684
|
scaleY = d;
|
|
@@ -720,8 +720,9 @@ var LeaferUI = function(exports) {
|
|
|
720
720
|
}
|
|
721
721
|
};
|
|
722
722
|
const M$b = MatrixHelper;
|
|
723
|
+
const {float: float$4} = MathHelper;
|
|
723
724
|
const {toInnerPoint: toInnerPoint$2, toOuterPoint: toOuterPoint$3} = MatrixHelper;
|
|
724
|
-
const {sin: sin$5, cos: cos$5, abs: abs$a, sqrt: sqrt$4, atan2: atan2$2, min: min$
|
|
725
|
+
const {sin: sin$5, cos: cos$5, abs: abs$a, sqrt: sqrt$4, atan2: atan2$2, min: min$3, round: round$5} = Math;
|
|
725
726
|
const PointHelper = {
|
|
726
727
|
defaultPoint: getPointData(),
|
|
727
728
|
tempPoint: {},
|
|
@@ -769,22 +770,27 @@ var LeaferUI = function(exports) {
|
|
|
769
770
|
},
|
|
770
771
|
tempToInnerOf(t, matrix) {
|
|
771
772
|
const {tempPoint: temp} = P$7;
|
|
772
|
-
copy$
|
|
773
|
+
copy$c(temp, t);
|
|
773
774
|
toInnerPoint$2(matrix, temp, temp);
|
|
774
775
|
return temp;
|
|
775
776
|
},
|
|
776
777
|
tempToOuterOf(t, matrix) {
|
|
777
778
|
const {tempPoint: temp} = P$7;
|
|
778
|
-
copy$
|
|
779
|
+
copy$c(temp, t);
|
|
779
780
|
toOuterPoint$3(matrix, temp, temp);
|
|
780
781
|
return temp;
|
|
781
782
|
},
|
|
782
783
|
tempToInnerRadiusPointOf(t, matrix) {
|
|
783
784
|
const {tempRadiusPoint: temp} = P$7;
|
|
784
|
-
copy$
|
|
785
|
+
copy$c(temp, t);
|
|
785
786
|
P$7.toInnerRadiusPointOf(t, matrix, temp);
|
|
786
787
|
return temp;
|
|
787
788
|
},
|
|
789
|
+
copyRadiusPoint(t, point, x, y) {
|
|
790
|
+
copy$c(t, point);
|
|
791
|
+
setRadius(t, x, y);
|
|
792
|
+
return t;
|
|
793
|
+
},
|
|
788
794
|
toInnerRadiusPointOf(t, matrix, to) {
|
|
789
795
|
to || (to = t);
|
|
790
796
|
toInnerPoint$2(matrix, t, to);
|
|
@@ -818,7 +824,7 @@ var LeaferUI = function(exports) {
|
|
|
818
824
|
return sqrt$4(x * x + y * y);
|
|
819
825
|
},
|
|
820
826
|
getMinDistanceFrom(x1, y1, x2, y2, x3, y3) {
|
|
821
|
-
return min$
|
|
827
|
+
return min$3(getDistanceFrom(x1, y1, x2, y2), getDistanceFrom(x2, y2, x3, y3));
|
|
822
828
|
},
|
|
823
829
|
getAngle(t, to) {
|
|
824
830
|
return getAtan2(t, to) / OneRadian;
|
|
@@ -852,14 +858,14 @@ var LeaferUI = function(exports) {
|
|
|
852
858
|
return points;
|
|
853
859
|
},
|
|
854
860
|
isSame(t, point) {
|
|
855
|
-
return t.x === point.x && t.y === point.y;
|
|
861
|
+
return float$4(t.x) === float$4(point.x) && float$4(t.y) === float$4(point.y);
|
|
856
862
|
},
|
|
857
863
|
reset(t) {
|
|
858
864
|
P$7.reset(t);
|
|
859
865
|
}
|
|
860
866
|
};
|
|
861
867
|
const P$7 = PointHelper;
|
|
862
|
-
const {getDistanceFrom: getDistanceFrom, copy: copy$
|
|
868
|
+
const {getDistanceFrom: getDistanceFrom, copy: copy$c, setRadius: setRadius, getAtan2: getAtan2} = P$7;
|
|
863
869
|
class Point {
|
|
864
870
|
constructor(x, y) {
|
|
865
871
|
this.set(x, y);
|
|
@@ -932,7 +938,7 @@ var LeaferUI = function(exports) {
|
|
|
932
938
|
return this;
|
|
933
939
|
}
|
|
934
940
|
}
|
|
935
|
-
const tempPoint$
|
|
941
|
+
const tempPoint$4 = new Point;
|
|
936
942
|
class Matrix {
|
|
937
943
|
constructor(a, b, c, d, e, f) {
|
|
938
944
|
this.set(a, b, c, d, e, f);
|
|
@@ -1186,7 +1192,7 @@ var LeaferUI = function(exports) {
|
|
|
1186
1192
|
};
|
|
1187
1193
|
const {tempPointBounds: tempPointBounds$1, setPoint: setPoint$5, addPoint: addPoint$3, toBounds: toBounds$3} = TwoPointBoundsHelper;
|
|
1188
1194
|
const {toOuterPoint: toOuterPoint$2} = MatrixHelper;
|
|
1189
|
-
const {float: float$
|
|
1195
|
+
const {float: float$3, fourNumber: fourNumber$1} = MathHelper;
|
|
1190
1196
|
const {floor: floor$1, ceil: ceil$2} = Math;
|
|
1191
1197
|
let right$4, bottom$3, boundsRight, boundsBottom;
|
|
1192
1198
|
const point$2 = {};
|
|
@@ -1245,7 +1251,7 @@ var LeaferUI = function(exports) {
|
|
|
1245
1251
|
return t;
|
|
1246
1252
|
},
|
|
1247
1253
|
toOffsetOutBounds(t, to, offsetBounds) {
|
|
1248
|
-
if (!to) to = t; else copy$
|
|
1254
|
+
if (!to) to = t; else copy$b(to, t);
|
|
1249
1255
|
if (!offsetBounds) offsetBounds = t;
|
|
1250
1256
|
to.offsetX = B.maxX(offsetBounds);
|
|
1251
1257
|
to.offsetY = B.maxY(offsetBounds);
|
|
@@ -1355,10 +1361,10 @@ var LeaferUI = function(exports) {
|
|
|
1355
1361
|
}
|
|
1356
1362
|
},
|
|
1357
1363
|
float(t, maxLength) {
|
|
1358
|
-
t.x = float$
|
|
1359
|
-
t.y = float$
|
|
1360
|
-
t.width = float$
|
|
1361
|
-
t.height = float$
|
|
1364
|
+
t.x = float$3(t.x, maxLength);
|
|
1365
|
+
t.y = float$3(t.y, maxLength);
|
|
1366
|
+
t.width = float$3(t.width, maxLength);
|
|
1367
|
+
t.height = float$3(t.height, maxLength);
|
|
1362
1368
|
},
|
|
1363
1369
|
add(t, bounds, isPoint) {
|
|
1364
1370
|
right$4 = t.x + t.width;
|
|
@@ -1392,7 +1398,7 @@ var LeaferUI = function(exports) {
|
|
|
1392
1398
|
if (bounds && (bounds.width || bounds.height)) {
|
|
1393
1399
|
if (first) {
|
|
1394
1400
|
first = false;
|
|
1395
|
-
if (!addMode) copy$
|
|
1401
|
+
if (!addMode) copy$b(t, bounds);
|
|
1396
1402
|
} else {
|
|
1397
1403
|
add$2(t, bounds);
|
|
1398
1404
|
}
|
|
@@ -1477,7 +1483,7 @@ var LeaferUI = function(exports) {
|
|
|
1477
1483
|
}
|
|
1478
1484
|
};
|
|
1479
1485
|
const B = BoundsHelper;
|
|
1480
|
-
const {add: add$2, copy: copy$
|
|
1486
|
+
const {add: add$2, copy: copy$b} = B;
|
|
1481
1487
|
class Bounds {
|
|
1482
1488
|
get minX() {
|
|
1483
1489
|
return BoundsHelper.minX(this);
|
|
@@ -2084,7 +2090,7 @@ var LeaferUI = function(exports) {
|
|
|
2084
2090
|
__decorate([ contextMethod() ], Canvas.prototype, "fillText", null);
|
|
2085
2091
|
__decorate([ contextMethod() ], Canvas.prototype, "measureText", null);
|
|
2086
2092
|
__decorate([ contextMethod() ], Canvas.prototype, "strokeText", null);
|
|
2087
|
-
const {copy: copy$
|
|
2093
|
+
const {copy: copy$a, multiplyParent: multiplyParent$4, pixelScale: pixelScale} = MatrixHelper, {round: round$4} = Math, tempPixelBounds = new Bounds, tempPixelBounds2 = new Bounds;
|
|
2088
2094
|
const minSize = {
|
|
2089
2095
|
width: 1,
|
|
2090
2096
|
height: 1,
|
|
@@ -2241,7 +2247,7 @@ var LeaferUI = function(exports) {
|
|
|
2241
2247
|
const {pixelRatio: pixelRatio} = this;
|
|
2242
2248
|
this.filter = `blur(${blur * pixelRatio}px)`;
|
|
2243
2249
|
}
|
|
2244
|
-
copyWorld(canvas, from, to, blendMode, ceilPixel
|
|
2250
|
+
copyWorld(canvas, from, to, blendMode, ceilPixel) {
|
|
2245
2251
|
if (blendMode) this.blendMode = blendMode;
|
|
2246
2252
|
if (from) {
|
|
2247
2253
|
this.setTempPixelBounds(from, ceilPixel);
|
|
@@ -2252,7 +2258,7 @@ var LeaferUI = function(exports) {
|
|
|
2252
2258
|
}
|
|
2253
2259
|
if (blendMode) this.blendMode = "source-over";
|
|
2254
2260
|
}
|
|
2255
|
-
copyWorldToInner(canvas, fromWorld, toInnerBounds, blendMode, ceilPixel
|
|
2261
|
+
copyWorldToInner(canvas, fromWorld, toInnerBounds, blendMode, ceilPixel) {
|
|
2256
2262
|
if (fromWorld.b || fromWorld.c) {
|
|
2257
2263
|
this.save();
|
|
2258
2264
|
this.resetTransform();
|
|
@@ -2265,7 +2271,7 @@ var LeaferUI = function(exports) {
|
|
|
2265
2271
|
if (blendMode) this.blendMode = "source-over";
|
|
2266
2272
|
}
|
|
2267
2273
|
}
|
|
2268
|
-
copyWorldByReset(canvas, from, to, blendMode, onlyResetTransform, ceilPixel
|
|
2274
|
+
copyWorldByReset(canvas, from, to, blendMode, onlyResetTransform, ceilPixel) {
|
|
2269
2275
|
this.resetTransform();
|
|
2270
2276
|
this.copyWorld(canvas, from, to, blendMode, ceilPixel);
|
|
2271
2277
|
if (!onlyResetTransform) this.useWorldTransform();
|
|
@@ -2335,7 +2341,7 @@ var LeaferUI = function(exports) {
|
|
|
2335
2341
|
getSameCanvas(useSameWorldTransform, useSameSmooth) {
|
|
2336
2342
|
const {size: size, pixelSnap: pixelSnap} = this, canvas = this.manager ? this.manager.get(size) : Creator.canvas(Object.assign({}, size));
|
|
2337
2343
|
canvas.save();
|
|
2338
|
-
if (useSameWorldTransform) copy$
|
|
2344
|
+
if (useSameWorldTransform) copy$a(canvas.worldTransform, this.worldTransform), canvas.useWorldTransform();
|
|
2339
2345
|
if (useSameSmooth) canvas.smooth = this.smooth;
|
|
2340
2346
|
canvas.pixelSnap !== pixelSnap && (canvas.pixelSnap = pixelSnap);
|
|
2341
2347
|
return canvas;
|
|
@@ -2463,18 +2469,18 @@ var LeaferUI = function(exports) {
|
|
|
2463
2469
|
data[0] ? drawer.arcTo(x, y, right, y, data[0]) : drawer.lineTo(x, y);
|
|
2464
2470
|
}
|
|
2465
2471
|
};
|
|
2466
|
-
const {sin: sin$4, cos: cos$4, hypot: hypot, atan2: atan2$1, ceil: ceil$1, abs: abs$9, PI: PI$3, sqrt: sqrt$3, pow: pow$1} = Math;
|
|
2472
|
+
const {sin: sin$4, cos: cos$4, hypot: hypot$1, atan2: atan2$1, ceil: ceil$1, abs: abs$9, PI: PI$3, sqrt: sqrt$3, pow: pow$1} = Math;
|
|
2467
2473
|
const {setPoint: setPoint$4, addPoint: addPoint$2} = TwoPointBoundsHelper;
|
|
2468
2474
|
const {set: set$1, toNumberPoints: toNumberPoints$1} = PointHelper;
|
|
2469
2475
|
const {M: M$a, L: L$a, C: C$8, Q: Q$7, Z: Z$8} = PathCommandMap;
|
|
2470
|
-
const tempPoint$
|
|
2476
|
+
const tempPoint$3 = {};
|
|
2471
2477
|
const BezierHelper = {
|
|
2472
2478
|
points(data, originPoints, curve, close) {
|
|
2473
2479
|
let points = toNumberPoints$1(originPoints);
|
|
2474
2480
|
data.push(M$a, points[0], points[1]);
|
|
2475
2481
|
if (curve && points.length > 5) {
|
|
2476
2482
|
let aX, aY, bX, bY, cX, cY, c1X, c1Y, c2X, c2Y;
|
|
2477
|
-
let ba, cb, d, len = points.length;
|
|
2483
|
+
let baX, baY, ba, cb, d, len = points.length;
|
|
2478
2484
|
const t = curve === true ? .5 : curve;
|
|
2479
2485
|
if (close) {
|
|
2480
2486
|
points = [ points[len - 2], points[len - 1], ...points, points[0], points[1], points[2], points[3] ];
|
|
@@ -2487,7 +2493,9 @@ var LeaferUI = function(exports) {
|
|
|
2487
2493
|
bY = points[i + 1];
|
|
2488
2494
|
cX = points[i + 2];
|
|
2489
2495
|
cY = points[i + 3];
|
|
2490
|
-
|
|
2496
|
+
baX = bX - aX;
|
|
2497
|
+
baY = bY - aY;
|
|
2498
|
+
ba = sqrt$3(pow$1(baX, 2) + pow$1(baY, 2));
|
|
2491
2499
|
cb = sqrt$3(pow$1(cX - bX, 2) + pow$1(cY - bY, 2));
|
|
2492
2500
|
if (!ba && !cb) continue;
|
|
2493
2501
|
d = ba + cb;
|
|
@@ -2500,7 +2508,7 @@ var LeaferUI = function(exports) {
|
|
|
2500
2508
|
if (i === 2) {
|
|
2501
2509
|
if (!close) data.push(Q$7, c1X, c1Y, bX, bY);
|
|
2502
2510
|
} else {
|
|
2503
|
-
data.push(C$8, c2X, c2Y, c1X, c1Y, bX, bY);
|
|
2511
|
+
if (baX || baY) data.push(C$8, c2X, c2Y, c1X, c1Y, bX, bY);
|
|
2504
2512
|
}
|
|
2505
2513
|
c2X = bX + cb * cX;
|
|
2506
2514
|
c2Y = bY + cb * cY;
|
|
@@ -2529,8 +2537,8 @@ var LeaferUI = function(exports) {
|
|
|
2529
2537
|
const CBy = toY - y1;
|
|
2530
2538
|
let startRadian = atan2$1(BAy, BAx);
|
|
2531
2539
|
let endRadian = atan2$1(CBy, CBx);
|
|
2532
|
-
const lenBA = hypot(BAx, BAy);
|
|
2533
|
-
const lenCB = hypot(CBx, CBy);
|
|
2540
|
+
const lenBA = hypot$1(BAx, BAy);
|
|
2541
|
+
const lenCB = hypot$1(CBx, CBy);
|
|
2534
2542
|
let totalRadian = endRadian - startRadian;
|
|
2535
2543
|
if (totalRadian < 0) totalRadian += PI2;
|
|
2536
2544
|
if (lenBA < 1e-12 || lenCB < 1e-12 || totalRadian < 1e-12 || abs$9(totalRadian - PI$3) < 1e-12) {
|
|
@@ -2635,8 +2643,8 @@ var LeaferUI = function(exports) {
|
|
|
2635
2643
|
addMode ? addPoint$2(pointBounds, fromX, fromY) : setPoint$4(pointBounds, fromX, fromY);
|
|
2636
2644
|
addPoint$2(pointBounds, toX, toY);
|
|
2637
2645
|
for (let i = 0, len = tList.length; i < len; i++) {
|
|
2638
|
-
getPointAndSet(tList[i], fromX, fromY, x1, y1, x2, y2, toX, toY, tempPoint$
|
|
2639
|
-
addPoint$2(pointBounds, tempPoint$
|
|
2646
|
+
getPointAndSet(tList[i], fromX, fromY, x1, y1, x2, y2, toX, toY, tempPoint$3);
|
|
2647
|
+
addPoint$2(pointBounds, tempPoint$3.x, tempPoint$3.y);
|
|
2640
2648
|
}
|
|
2641
2649
|
},
|
|
2642
2650
|
getPointAndSet(t, fromX, fromY, x1, y1, x2, y2, toX, toY, setPoint) {
|
|
@@ -3031,7 +3039,7 @@ var LeaferUI = function(exports) {
|
|
|
3031
3039
|
const {current: current, pushData: pushData, copyData: copyData} = PathConvert;
|
|
3032
3040
|
const {M: M$8, L: L$8, C: C$6, Q: Q$5, Z: Z$6, N: N$4, D: D$5, X: X$4, G: G$4, F: F$5, O: O$5, P: P$4, U: U$4} = PathCommandMap;
|
|
3033
3041
|
const {getMinDistanceFrom: getMinDistanceFrom, getRadianFrom: getRadianFrom} = PointHelper;
|
|
3034
|
-
const {tan: tan, min: min$
|
|
3042
|
+
const {tan: tan, min: min$2, abs: abs$8} = Math;
|
|
3035
3043
|
const startPoint = {};
|
|
3036
3044
|
const PathCommandDataHelper = {
|
|
3037
3045
|
beginPath(data) {
|
|
@@ -3068,6 +3076,7 @@ var LeaferUI = function(exports) {
|
|
|
3068
3076
|
}
|
|
3069
3077
|
},
|
|
3070
3078
|
ellipse(data, x, y, radiusX, radiusY, rotation, startAngle, endAngle, anticlockwise) {
|
|
3079
|
+
if (radiusX === radiusY) return arc$2(data, x, y, radiusX, startAngle, endAngle, anticlockwise);
|
|
3071
3080
|
if (isNull(rotation)) {
|
|
3072
3081
|
data.push(F$5, x, y, radiusX, radiusY);
|
|
3073
3082
|
} else {
|
|
@@ -3080,6 +3089,7 @@ var LeaferUI = function(exports) {
|
|
|
3080
3089
|
if (isNull(startAngle)) {
|
|
3081
3090
|
data.push(P$4, x, y, radius);
|
|
3082
3091
|
} else {
|
|
3092
|
+
if (isNull(startAngle)) startAngle = 0;
|
|
3083
3093
|
if (isNull(endAngle)) endAngle = 360;
|
|
3084
3094
|
data.push(O$5, x, y, radius, startAngle, endAngle, anticlockwise ? 1 : 0);
|
|
3085
3095
|
}
|
|
@@ -3087,7 +3097,7 @@ var LeaferUI = function(exports) {
|
|
|
3087
3097
|
arcTo(data, x1, y1, x2, y2, radius, lastX, lastY) {
|
|
3088
3098
|
if (!isUndefined(lastX)) {
|
|
3089
3099
|
const d = getMinDistanceFrom(lastX, lastY, x1, y1, x2, y2);
|
|
3090
|
-
radius = min$
|
|
3100
|
+
radius = min$2(radius, min$2(d / 2, d / 2 * abs$8(tan(getRadianFrom(lastX, lastY, x1, y1, x2, y2) / 2))));
|
|
3091
3101
|
}
|
|
3092
3102
|
data.push(U$4, x1, y1, x2, y2, radius);
|
|
3093
3103
|
},
|
|
@@ -3280,7 +3290,7 @@ var LeaferUI = function(exports) {
|
|
|
3280
3290
|
};
|
|
3281
3291
|
const {M: M$6, L: L$6, C: C$4, Q: Q$3, Z: Z$4, N: N$2, D: D$3, X: X$2, G: G$2, F: F$3, O: O$3, P: P$2, U: U$2} = PathCommandMap;
|
|
3282
3292
|
const {toTwoPointBounds: toTwoPointBounds, toTwoPointBoundsByQuadraticCurve: toTwoPointBoundsByQuadraticCurve, arcTo: arcTo$1, arc: arc, ellipse: ellipse$1} = BezierHelper;
|
|
3283
|
-
const {addPointBounds: addPointBounds, copy: copy$
|
|
3293
|
+
const {addPointBounds: addPointBounds, copy: copy$9, addPoint: addPoint$1, setPoint: setPoint$3, addBounds: addBounds, toBounds: toBounds$2} = TwoPointBoundsHelper;
|
|
3284
3294
|
const debug$d = Debug.get("PathBounds");
|
|
3285
3295
|
let radius, radiusX, radiusY;
|
|
3286
3296
|
const tempPointBounds = {};
|
|
@@ -3356,7 +3366,7 @@ var LeaferUI = function(exports) {
|
|
|
3356
3366
|
|
|
3357
3367
|
case G$2:
|
|
3358
3368
|
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);
|
|
3359
|
-
i === 0 ? copy$
|
|
3369
|
+
i === 0 ? copy$9(setPointBounds, tempPointBounds) : addPointBounds(setPointBounds, tempPointBounds);
|
|
3360
3370
|
x = setEndPoint.x;
|
|
3361
3371
|
y = setEndPoint.y;
|
|
3362
3372
|
i += 9;
|
|
@@ -3374,7 +3384,7 @@ var LeaferUI = function(exports) {
|
|
|
3374
3384
|
|
|
3375
3385
|
case O$3:
|
|
3376
3386
|
arc(null, data[i + 1], data[i + 2], data[i + 3], data[i + 4], data[i + 5], data[i + 6], tempPointBounds, setEndPoint);
|
|
3377
|
-
i === 0 ? copy$
|
|
3387
|
+
i === 0 ? copy$9(setPointBounds, tempPointBounds) : addPointBounds(setPointBounds, tempPointBounds);
|
|
3378
3388
|
x = setEndPoint.x;
|
|
3379
3389
|
y = setEndPoint.y;
|
|
3380
3390
|
i += 7;
|
|
@@ -3391,7 +3401,7 @@ var LeaferUI = function(exports) {
|
|
|
3391
3401
|
|
|
3392
3402
|
case U$2:
|
|
3393
3403
|
arcTo$1(null, x, y, data[i + 1], data[i + 2], data[i + 3], data[i + 4], data[i + 5], tempPointBounds, setEndPoint);
|
|
3394
|
-
i === 0 ? copy$
|
|
3404
|
+
i === 0 ? copy$9(setPointBounds, tempPointBounds) : addPointBounds(setPointBounds, tempPointBounds);
|
|
3395
3405
|
x = setEndPoint.x;
|
|
3396
3406
|
y = setEndPoint.y;
|
|
3397
3407
|
i += 6;
|
|
@@ -3411,6 +3421,7 @@ var LeaferUI = function(exports) {
|
|
|
3411
3421
|
smooth(data, cornerRadius, _cornerSmoothing) {
|
|
3412
3422
|
let command, lastCommand, commandLen;
|
|
3413
3423
|
let i = 0, x = 0, y = 0, startX = 0, startY = 0, secondX = 0, secondY = 0, lastX = 0, lastY = 0;
|
|
3424
|
+
if (isArray(cornerRadius)) cornerRadius = cornerRadius[0] || 0;
|
|
3414
3425
|
const len = data.length;
|
|
3415
3426
|
const smooth = [];
|
|
3416
3427
|
while (i < len) {
|
|
@@ -3808,7 +3819,9 @@ var LeaferUI = function(exports) {
|
|
|
3808
3819
|
const ImageManager = {
|
|
3809
3820
|
maxRecycled: 10,
|
|
3810
3821
|
recycledList: [],
|
|
3811
|
-
patternTasker: new TaskProcessor
|
|
3822
|
+
patternTasker: new TaskProcessor({
|
|
3823
|
+
parallel: 1
|
|
3824
|
+
}),
|
|
3812
3825
|
get(config) {
|
|
3813
3826
|
let image = Resource.get(config.url);
|
|
3814
3827
|
if (!image) Resource.set(config.url, image = Creator.image(config));
|
|
@@ -4338,7 +4351,7 @@ var LeaferUI = function(exports) {
|
|
|
4338
4351
|
EventCreator.register(target);
|
|
4339
4352
|
};
|
|
4340
4353
|
}
|
|
4341
|
-
const {copy: copy$
|
|
4354
|
+
const {copy: copy$8, toInnerPoint: toInnerPoint$1, toOuterPoint: toOuterPoint$1, scaleOfOuter: scaleOfOuter$2, rotateOfOuter: rotateOfOuter$2, skewOfOuter: skewOfOuter, multiplyParent: multiplyParent$3, divideParent: divideParent, getLayout: getLayout} = MatrixHelper;
|
|
4342
4355
|
const matrix$3 = {}, {round: round$3} = Math;
|
|
4343
4356
|
const LeafHelper = {
|
|
4344
4357
|
updateAllMatrix(leaf, checkAutoLayout, waitAutoLayout) {
|
|
@@ -4434,7 +4447,7 @@ var LeaferUI = function(exports) {
|
|
|
4434
4447
|
if (scaleY) transition = scaleY;
|
|
4435
4448
|
scaleY = scaleX;
|
|
4436
4449
|
}
|
|
4437
|
-
copy$
|
|
4450
|
+
copy$8(matrix$3, o);
|
|
4438
4451
|
scaleOfOuter$2(matrix$3, origin, scaleX, scaleY);
|
|
4439
4452
|
if (L$4.hasHighPosition(t)) {
|
|
4440
4453
|
L$4.setTransform(t, matrix$3, resize, transition);
|
|
@@ -4453,7 +4466,7 @@ var LeaferUI = function(exports) {
|
|
|
4453
4466
|
},
|
|
4454
4467
|
rotateOfLocal(t, origin, angle, transition) {
|
|
4455
4468
|
const o = t.__localMatrix;
|
|
4456
|
-
copy$
|
|
4469
|
+
copy$8(matrix$3, o);
|
|
4457
4470
|
rotateOfOuter$2(matrix$3, origin, angle);
|
|
4458
4471
|
if (L$4.hasHighPosition(t)) L$4.setTransform(t, matrix$3, false, transition); else t.set({
|
|
4459
4472
|
x: t.x + matrix$3.e - o.e,
|
|
@@ -4465,18 +4478,18 @@ var LeaferUI = function(exports) {
|
|
|
4465
4478
|
L$4.skewOfLocal(t, getTempLocal(t, origin), skewX, skewY, resize, transition);
|
|
4466
4479
|
},
|
|
4467
4480
|
skewOfLocal(t, origin, skewX, skewY = 0, resize, transition) {
|
|
4468
|
-
copy$
|
|
4481
|
+
copy$8(matrix$3, t.__localMatrix);
|
|
4469
4482
|
skewOfOuter(matrix$3, origin, skewX, skewY);
|
|
4470
4483
|
L$4.setTransform(t, matrix$3, resize, transition);
|
|
4471
4484
|
},
|
|
4472
4485
|
transformWorld(t, transform, resize, transition) {
|
|
4473
|
-
copy$
|
|
4486
|
+
copy$8(matrix$3, t.worldTransform);
|
|
4474
4487
|
multiplyParent$3(matrix$3, transform);
|
|
4475
4488
|
if (t.parent) divideParent(matrix$3, t.parent.scrollWorldTransform);
|
|
4476
4489
|
L$4.setTransform(t, matrix$3, resize, transition);
|
|
4477
4490
|
},
|
|
4478
4491
|
transform(t, transform, resize, transition) {
|
|
4479
|
-
copy$
|
|
4492
|
+
copy$8(matrix$3, t.localTransform);
|
|
4480
4493
|
multiplyParent$3(matrix$3, transform);
|
|
4481
4494
|
L$4.setTransform(t, matrix$3, resize, transition);
|
|
4482
4495
|
},
|
|
@@ -4514,7 +4527,7 @@ var LeaferUI = function(exports) {
|
|
|
4514
4527
|
return innerOrigin;
|
|
4515
4528
|
},
|
|
4516
4529
|
getRelativeWorld(t, relative, temp) {
|
|
4517
|
-
copy$
|
|
4530
|
+
copy$8(matrix$3, t.worldTransform);
|
|
4518
4531
|
divideParent(matrix$3, relative.scrollWorldTransform);
|
|
4519
4532
|
return temp ? matrix$3 : Object.assign({}, matrix$3);
|
|
4520
4533
|
},
|
|
@@ -4710,7 +4723,7 @@ var LeaferUI = function(exports) {
|
|
|
4710
4723
|
}
|
|
4711
4724
|
};
|
|
4712
4725
|
const {getRelativeWorld: getRelativeWorld$1, updateBounds: updateBounds$3} = LeafHelper;
|
|
4713
|
-
const {toOuterOf: toOuterOf$3, getPoints: getPoints, copy: copy$
|
|
4726
|
+
const {toOuterOf: toOuterOf$3, getPoints: getPoints, copy: copy$7} = BoundsHelper;
|
|
4714
4727
|
const localContent = "_localContentBounds";
|
|
4715
4728
|
const worldContent = "_worldContentBounds", worldBox = "_worldBoxBounds", worldStroke = "_worldStrokeBounds";
|
|
4716
4729
|
class LeafLayout {
|
|
@@ -4946,7 +4959,7 @@ var LeaferUI = function(exports) {
|
|
|
4946
4959
|
matrix = getRelativeWorld$1(leaf, relative, true);
|
|
4947
4960
|
}
|
|
4948
4961
|
if (!layoutBounds) layoutBounds = MatrixHelper.getLayout(matrix);
|
|
4949
|
-
copy$
|
|
4962
|
+
copy$7(layoutBounds, bounds);
|
|
4950
4963
|
PointHelper.copy(layoutBounds, point);
|
|
4951
4964
|
if (unscale) {
|
|
4952
4965
|
const {scaleX: scaleX, scaleY: scaleY} = layoutBounds;
|
|
@@ -5491,7 +5504,7 @@ var LeaferUI = function(exports) {
|
|
|
5491
5504
|
}
|
|
5492
5505
|
};
|
|
5493
5506
|
const {setLayout: setLayout, multiplyParent: multiplyParent$2, translateInner: translateInner, defaultWorld: defaultWorld} = MatrixHelper;
|
|
5494
|
-
const {toPoint: toPoint$4, tempPoint: tempPoint$
|
|
5507
|
+
const {toPoint: toPoint$4, tempPoint: tempPoint$2} = AroundHelper;
|
|
5495
5508
|
const LeafMatrix = {
|
|
5496
5509
|
__updateWorldMatrix() {
|
|
5497
5510
|
const {parent: parent, __layout: __layout, __world: __world, __scrollWorld: __scrollWorld, __: __} = this;
|
|
@@ -5510,8 +5523,8 @@ var LeaferUI = function(exports) {
|
|
|
5510
5523
|
local.e = data.x + data.offsetX;
|
|
5511
5524
|
local.f = data.y + data.offsetY;
|
|
5512
5525
|
if (data.around || data.origin) {
|
|
5513
|
-
toPoint$4(data.around || data.origin, layout.boxBounds, tempPoint$
|
|
5514
|
-
translateInner(local, -tempPoint$
|
|
5526
|
+
toPoint$4(data.around || data.origin, layout.boxBounds, tempPoint$2);
|
|
5527
|
+
translateInner(local, -tempPoint$2.x, -tempPoint$2.y, !data.around);
|
|
5515
5528
|
}
|
|
5516
5529
|
}
|
|
5517
5530
|
this.__layout.matrixChanged = undefined;
|
|
@@ -5519,7 +5532,7 @@ var LeaferUI = function(exports) {
|
|
|
5519
5532
|
};
|
|
5520
5533
|
const {updateMatrix: updateMatrix$3, updateAllMatrix: updateAllMatrix$3} = LeafHelper;
|
|
5521
5534
|
const {updateBounds: updateBounds$2} = BranchHelper;
|
|
5522
|
-
const {toOuterOf: toOuterOf$2, copyAndSpread: copyAndSpread$3, copy: copy$
|
|
5535
|
+
const {toOuterOf: toOuterOf$2, copyAndSpread: copyAndSpread$3, copy: copy$6} = BoundsHelper;
|
|
5523
5536
|
const {toBounds: toBounds$1} = PathBounds;
|
|
5524
5537
|
const LeafBounds = {
|
|
5525
5538
|
__updateWorldBounds() {
|
|
@@ -5628,7 +5641,7 @@ var LeaferUI = function(exports) {
|
|
|
5628
5641
|
},
|
|
5629
5642
|
__updateRenderBounds(_bounds) {
|
|
5630
5643
|
const layout = this.__layout, {renderSpread: renderSpread} = layout;
|
|
5631
|
-
isNumber(renderSpread) && renderSpread <= 0 ? copy$
|
|
5644
|
+
isNumber(renderSpread) && renderSpread <= 0 ? copy$6(layout.renderBounds, layout.strokeBounds) : copyAndSpread$3(layout.renderBounds, layout.boxBounds, renderSpread);
|
|
5632
5645
|
}
|
|
5633
5646
|
};
|
|
5634
5647
|
const LeafRender = {
|
|
@@ -5724,7 +5737,7 @@ var LeaferUI = function(exports) {
|
|
|
5724
5737
|
const {stintSet: stintSet$4} = DataHelper;
|
|
5725
5738
|
const {toInnerPoint: toInnerPoint, toOuterPoint: toOuterPoint, multiplyParent: multiplyParent$1} = MatrixHelper;
|
|
5726
5739
|
const {toOuterOf: toOuterOf$1} = BoundsHelper;
|
|
5727
|
-
const {copy: copy$
|
|
5740
|
+
const {copy: copy$5, move: move$8} = PointHelper;
|
|
5728
5741
|
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;
|
|
5729
5742
|
exports.Leaf = class Leaf {
|
|
5730
5743
|
get tag() {
|
|
@@ -6041,14 +6054,14 @@ var LeaferUI = function(exports) {
|
|
|
6041
6054
|
if (this.parent) {
|
|
6042
6055
|
this.parent.worldToInner(world, to, distance, relative);
|
|
6043
6056
|
} else {
|
|
6044
|
-
if (to) copy$
|
|
6057
|
+
if (to) copy$5(to, world);
|
|
6045
6058
|
}
|
|
6046
6059
|
}
|
|
6047
6060
|
localToWorld(local, to, distance, relative) {
|
|
6048
6061
|
if (this.parent) {
|
|
6049
6062
|
this.parent.innerToWorld(local, to, distance, relative);
|
|
6050
6063
|
} else {
|
|
6051
|
-
if (to) copy$
|
|
6064
|
+
if (to) copy$5(to, local);
|
|
6052
6065
|
}
|
|
6053
6066
|
}
|
|
6054
6067
|
worldToInner(world, to, distance, relative) {
|
|
@@ -6513,7 +6526,7 @@ var LeaferUI = function(exports) {
|
|
|
6513
6526
|
this.levelMap = null;
|
|
6514
6527
|
}
|
|
6515
6528
|
}
|
|
6516
|
-
const version = "1.12.
|
|
6529
|
+
const version = "1.12.2";
|
|
6517
6530
|
class LeaferCanvas extends LeaferCanvasBase {
|
|
6518
6531
|
get allowBackgroundColor() {
|
|
6519
6532
|
return true;
|
|
@@ -7133,6 +7146,8 @@ var LeaferUI = function(exports) {
|
|
|
7133
7146
|
}
|
|
7134
7147
|
}
|
|
7135
7148
|
Renderer.clipSpread = 10;
|
|
7149
|
+
const tempPoint$1 = {};
|
|
7150
|
+
const {copyRadiusPoint: copyRadiusPoint$1} = PointHelper;
|
|
7136
7151
|
const {hitRadiusPoint: hitRadiusPoint$1} = BoundsHelper;
|
|
7137
7152
|
class Picker {
|
|
7138
7153
|
constructor(target, selector) {
|
|
@@ -7258,15 +7273,15 @@ var LeaferUI = function(exports) {
|
|
|
7258
7273
|
this.eachFind(branch.children, branch.__onlyHitMask);
|
|
7259
7274
|
}
|
|
7260
7275
|
eachFind(children, hitMask) {
|
|
7261
|
-
let child, hit;
|
|
7276
|
+
let child, hit, data;
|
|
7262
7277
|
const {point: point} = this, len = children.length;
|
|
7263
7278
|
for (let i = len - 1; i > -1; i--) {
|
|
7264
|
-
child = children[i];
|
|
7265
|
-
if (!
|
|
7266
|
-
hit = child.
|
|
7279
|
+
child = children[i], data = child.__;
|
|
7280
|
+
if (!data.visible || hitMask && !data.mask) continue;
|
|
7281
|
+
hit = hitRadiusPoint$1(child.__world, data.hitRadius ? copyRadiusPoint$1(tempPoint$1, point, data.hitRadius) : point);
|
|
7267
7282
|
if (child.isBranch) {
|
|
7268
7283
|
if (hit || child.__ignoreHitWorld) {
|
|
7269
|
-
if (child.isBranchLeaf &&
|
|
7284
|
+
if (child.isBranchLeaf && data.__clipAfterFill && !child.__hitWorld(point, true)) continue;
|
|
7270
7285
|
if (child.topChildren) this.eachFind(child.topChildren, false);
|
|
7271
7286
|
this.eachFind(child.children, child.__onlyHitMask);
|
|
7272
7287
|
if (child.isBranchLeaf) this.hitChild(child, point);
|
|
@@ -7710,7 +7725,7 @@ var LeaferUI = function(exports) {
|
|
|
7710
7725
|
return data;
|
|
7711
7726
|
}
|
|
7712
7727
|
}
|
|
7713
|
-
const {max: max$
|
|
7728
|
+
const {max: max$4, add: add$1} = FourNumberHelper;
|
|
7714
7729
|
const UIBounds = {
|
|
7715
7730
|
__updateStrokeSpread() {
|
|
7716
7731
|
let spread = 0, boxSpread = 0;
|
|
@@ -7725,7 +7740,7 @@ var LeaferUI = function(exports) {
|
|
|
7725
7740
|
}
|
|
7726
7741
|
if (data.__useArrow) spread += strokeWidth * 5;
|
|
7727
7742
|
if (box) {
|
|
7728
|
-
spread = max$
|
|
7743
|
+
spread = max$4(spread, box.__layout.strokeSpread = box.__updateStrokeSpread());
|
|
7729
7744
|
boxSpread = Math.max(boxSpread, box.__layout.strokeBoxSpread);
|
|
7730
7745
|
}
|
|
7731
7746
|
this.__layout.strokeBoxSpread = boxSpread;
|
|
@@ -7735,15 +7750,15 @@ var LeaferUI = function(exports) {
|
|
|
7735
7750
|
let spread = 0;
|
|
7736
7751
|
const {shadow: shadow, innerShadow: innerShadow, blur: blur, backgroundBlur: backgroundBlur, filter: filter, renderSpread: renderSpread} = this.__, {strokeSpread: strokeSpread} = this.__layout, box = this.__box;
|
|
7737
7752
|
if (shadow) spread = Effect.getShadowRenderSpread(this, shadow);
|
|
7738
|
-
if (blur) spread = max$
|
|
7753
|
+
if (blur) spread = max$4(spread, blur);
|
|
7739
7754
|
if (filter) spread = add$1(spread, Filter.getSpread(filter));
|
|
7740
7755
|
if (renderSpread) spread = add$1(spread, renderSpread);
|
|
7741
7756
|
if (strokeSpread) spread = add$1(spread, strokeSpread);
|
|
7742
7757
|
let shapeSpread = spread;
|
|
7743
|
-
if (innerShadow) shapeSpread = max$
|
|
7744
|
-
if (backgroundBlur) shapeSpread = max$
|
|
7758
|
+
if (innerShadow) shapeSpread = max$4(shapeSpread, Effect.getInnerShadowSpread(this, innerShadow));
|
|
7759
|
+
if (backgroundBlur) shapeSpread = max$4(shapeSpread, backgroundBlur);
|
|
7745
7760
|
this.__layout.renderShapeSpread = shapeSpread;
|
|
7746
|
-
return box ? max$
|
|
7761
|
+
return box ? max$4(box.__updateRenderSpread(), spread) : spread;
|
|
7747
7762
|
}
|
|
7748
7763
|
};
|
|
7749
7764
|
const {stintSet: stintSet$2} = DataHelper;
|
|
@@ -7797,7 +7812,7 @@ var LeaferUI = function(exports) {
|
|
|
7797
7812
|
if (stroke && !__fillAfterStroke) data.__isStrokes ? Paint.strokes(stroke, this, canvas, options) : Paint.stroke(stroke, this, canvas, options);
|
|
7798
7813
|
}
|
|
7799
7814
|
} else {
|
|
7800
|
-
if (data.
|
|
7815
|
+
if (data.__pathForRender) drawFast(this, canvas, options); else this.__drawFast(canvas, options);
|
|
7801
7816
|
}
|
|
7802
7817
|
},
|
|
7803
7818
|
__drawShape(canvas, options) {
|
|
@@ -7917,7 +7932,7 @@ var LeaferUI = function(exports) {
|
|
|
7917
7932
|
getPath(curve, pathForRender) {
|
|
7918
7933
|
this.__layout.update();
|
|
7919
7934
|
let path = pathForRender ? this.__.__pathForRender : this.__.path;
|
|
7920
|
-
if (!path) pen.set(path = []), this.__drawPathByBox(pen);
|
|
7935
|
+
if (!path) pen.set(path = []), this.__drawPathByBox(pen, !pathForRender);
|
|
7921
7936
|
return curve ? PathConvert.toCanvasData(path, true) : path;
|
|
7922
7937
|
}
|
|
7923
7938
|
getPathString(curve, pathForRender, floatLength) {
|
|
@@ -7945,17 +7960,18 @@ var LeaferUI = function(exports) {
|
|
|
7945
7960
|
}
|
|
7946
7961
|
__drawPath(canvas) {
|
|
7947
7962
|
canvas.beginPath();
|
|
7948
|
-
this.__drawPathByData(canvas, this.__.path);
|
|
7963
|
+
this.__drawPathByData(canvas, this.__.path, true);
|
|
7949
7964
|
}
|
|
7950
|
-
__drawPathByData(drawer, data) {
|
|
7951
|
-
data ? PathDrawer.drawPathByData(drawer, data) : this.__drawPathByBox(drawer);
|
|
7965
|
+
__drawPathByData(drawer, data, ignoreCornerRadius) {
|
|
7966
|
+
data ? PathDrawer.drawPathByData(drawer, data) : this.__drawPathByBox(drawer, ignoreCornerRadius);
|
|
7952
7967
|
}
|
|
7953
|
-
__drawPathByBox(drawer) {
|
|
7968
|
+
__drawPathByBox(drawer, ignoreCornerRadius) {
|
|
7954
7969
|
const {x: x, y: y, width: width, height: height} = this.__layout.boxBounds;
|
|
7955
|
-
if (this.__.cornerRadius) {
|
|
7970
|
+
if (this.__.cornerRadius && !ignoreCornerRadius) {
|
|
7956
7971
|
const {cornerRadius: cornerRadius} = this.__;
|
|
7957
7972
|
drawer.roundRect(x, y, width, height, isNumber(cornerRadius) ? [ cornerRadius ] : cornerRadius);
|
|
7958
7973
|
} else drawer.rect(x, y, width, height);
|
|
7974
|
+
drawer.closePath();
|
|
7959
7975
|
}
|
|
7960
7976
|
drawImagePlaceholder(_paint, canvas, renderOptions) {
|
|
7961
7977
|
Paint.fill(this.__.placeholderColor, this, canvas, renderOptions);
|
|
@@ -8142,6 +8158,9 @@ var LeaferUI = function(exports) {
|
|
|
8142
8158
|
get layoutLocked() {
|
|
8143
8159
|
return !this.layouter.running;
|
|
8144
8160
|
}
|
|
8161
|
+
get view() {
|
|
8162
|
+
return this.canvas && this.canvas.view;
|
|
8163
|
+
}
|
|
8145
8164
|
get FPS() {
|
|
8146
8165
|
return this.renderer ? this.renderer.FPS : 60;
|
|
8147
8166
|
}
|
|
@@ -8193,7 +8212,6 @@ var LeaferUI = function(exports) {
|
|
|
8193
8212
|
this.__controllers.push(this.renderer = Creator.renderer(this, canvas, config), this.watcher = Creator.watcher(this, config), this.layouter = Creator.layouter(this, config));
|
|
8194
8213
|
if (this.isApp) this.__setApp();
|
|
8195
8214
|
this.__checkAutoLayout();
|
|
8196
|
-
this.view = canvas.view;
|
|
8197
8215
|
if (!parentApp) {
|
|
8198
8216
|
this.selector = Creator.selector(this);
|
|
8199
8217
|
this.interaction = Creator.interaction(this, canvas, this.selector, config);
|
|
@@ -8473,7 +8491,7 @@ var LeaferUI = function(exports) {
|
|
|
8473
8491
|
if (this.canvasManager) this.canvasManager.destroy();
|
|
8474
8492
|
}
|
|
8475
8493
|
if (this.canvas) this.canvas.destroy();
|
|
8476
|
-
this.config.view = this.
|
|
8494
|
+
this.config.view = this.parentApp = null;
|
|
8477
8495
|
if (this.userConfig) this.userConfig.view = null;
|
|
8478
8496
|
super.destroy();
|
|
8479
8497
|
setTimeout(() => {
|
|
@@ -8625,7 +8643,6 @@ var LeaferUI = function(exports) {
|
|
|
8625
8643
|
if (startAngle || endAngle) {
|
|
8626
8644
|
if (innerRadius < 1) ellipse(path, rx, ry, rx * innerRadius, ry * innerRadius, 0, startAngle, endAngle, false);
|
|
8627
8645
|
ellipse(path, rx, ry, rx, ry, 0, endAngle, startAngle, true);
|
|
8628
|
-
if (innerRadius < 1) closePath$2(path);
|
|
8629
8646
|
} else {
|
|
8630
8647
|
if (innerRadius < 1) {
|
|
8631
8648
|
ellipse(path, rx, ry, rx * innerRadius, ry * innerRadius);
|
|
@@ -8633,16 +8650,16 @@ var LeaferUI = function(exports) {
|
|
|
8633
8650
|
}
|
|
8634
8651
|
ellipse(path, rx, ry, rx, ry, 0, 360, 0, true);
|
|
8635
8652
|
}
|
|
8636
|
-
if (Platform.ellipseToCurve) this.__.path = this.getPath(true);
|
|
8637
8653
|
} else {
|
|
8638
8654
|
if (startAngle || endAngle) {
|
|
8639
8655
|
moveTo$3(path, rx, ry);
|
|
8640
8656
|
ellipse(path, rx, ry, rx, ry, 0, startAngle, endAngle, false);
|
|
8641
|
-
closePath$2(path);
|
|
8642
8657
|
} else {
|
|
8643
8658
|
ellipse(path, rx, ry, rx, ry);
|
|
8644
8659
|
}
|
|
8645
8660
|
}
|
|
8661
|
+
closePath$2(path);
|
|
8662
|
+
if (Platform.ellipseToCurve) this.__.path = this.getPath(true);
|
|
8646
8663
|
}
|
|
8647
8664
|
};
|
|
8648
8665
|
__decorate([ dataProcessor(EllipseData) ], exports.Ellipse.prototype, "__", void 0);
|
|
@@ -9203,7 +9220,7 @@ var LeaferUI = function(exports) {
|
|
|
9203
9220
|
EventCreator.changeName(oldName, newName);
|
|
9204
9221
|
}
|
|
9205
9222
|
}
|
|
9206
|
-
const {min: min, max: max$
|
|
9223
|
+
const {min: min$1, max: max$3, abs: abs$7} = Math, {float: float$2, sign: sign$2} = MathHelper, {minX: minX, maxX: maxX, minY: minY, maxY: maxY} = BoundsHelper;
|
|
9207
9224
|
const tempContent = new Bounds, tempDragBounds = new Bounds;
|
|
9208
9225
|
const DragBoundsHelper = {
|
|
9209
9226
|
limitMove(leaf, move) {
|
|
@@ -9241,8 +9258,8 @@ var LeaferUI = function(exports) {
|
|
|
9241
9258
|
} else {
|
|
9242
9259
|
if (y < dragBounds.y) move.y += dragBounds.y - y; else if (bottom > boundsBottom) move.y += boundsBottom - bottom;
|
|
9243
9260
|
}
|
|
9244
|
-
move.x = float$
|
|
9245
|
-
move.y = float$
|
|
9261
|
+
move.x = float$2(move.x);
|
|
9262
|
+
move.y = float$2(move.y);
|
|
9246
9263
|
return move;
|
|
9247
9264
|
},
|
|
9248
9265
|
getValidScaleOf(content, dragBounds, dragBoundsType, origin, scale, lockRatio, change) {
|
|
@@ -9254,44 +9271,44 @@ var LeaferUI = function(exports) {
|
|
|
9254
9271
|
let correctScaleX = 1, correctScaleY = 1, aScale, bScale, aSize, bSize;
|
|
9255
9272
|
if (D$2.isInnerMode(content, dragBounds, dragBoundsType, "width")) {
|
|
9256
9273
|
if (scale.x < 0) tempContent.scaleOf(origin, correctScaleX = 1 / scale.x, 1);
|
|
9257
|
-
aSize = float$
|
|
9258
|
-
bSize = float$
|
|
9274
|
+
aSize = float$2(tempContent.minX - tempDragBounds.minX);
|
|
9275
|
+
bSize = float$2(tempDragBounds.maxX - tempContent.maxX);
|
|
9259
9276
|
aScale = originLeftScale && aSize > 0 ? 1 + aSize / (originLeftScale * tempContent.width) : 1;
|
|
9260
9277
|
bScale = originRightScale && bSize > 0 ? 1 + bSize / (originRightScale * tempContent.width) : 1;
|
|
9261
|
-
correctScaleX *= max$
|
|
9278
|
+
correctScaleX *= max$3(aScale, bScale);
|
|
9262
9279
|
} else {
|
|
9263
9280
|
if (scale.x < 0) {
|
|
9264
|
-
if (float$
|
|
9281
|
+
if (float$2(minX(content) - minX(dragBounds)) <= 0 || float$2(maxX(dragBounds) - maxX(content)) <= 0) tempContent.scaleOf(origin, correctScaleX = 1 / scale.x, 1);
|
|
9265
9282
|
tempContent.unsign();
|
|
9266
9283
|
}
|
|
9267
|
-
aSize = float$
|
|
9268
|
-
bSize = float$
|
|
9284
|
+
aSize = float$2(tempDragBounds.minX - tempContent.minX);
|
|
9285
|
+
bSize = float$2(tempContent.maxX - tempDragBounds.maxX);
|
|
9269
9286
|
aScale = originLeftScale && aSize > 0 ? 1 - aSize / (originLeftScale * tempContent.width) : 1;
|
|
9270
9287
|
bScale = originRightScale && bSize > 0 ? 1 - bSize / (originRightScale * tempContent.width) : 1;
|
|
9271
|
-
correctScaleX *= min(aScale, bScale);
|
|
9288
|
+
correctScaleX *= min$1(aScale, bScale);
|
|
9272
9289
|
}
|
|
9273
9290
|
if (D$2.isInnerMode(content, dragBounds, dragBoundsType, "height")) {
|
|
9274
9291
|
if (scale.y < 0) tempContent.scaleOf(origin, 1, correctScaleY = 1 / scale.y);
|
|
9275
|
-
aSize = float$
|
|
9276
|
-
bSize = float$
|
|
9292
|
+
aSize = float$2(tempContent.minY - tempDragBounds.minY);
|
|
9293
|
+
bSize = float$2(tempDragBounds.maxY - tempContent.maxY);
|
|
9277
9294
|
aScale = originTopScale && aSize > 0 ? 1 + aSize / (originTopScale * tempContent.height) : 1;
|
|
9278
9295
|
bScale = originBottomScale && bSize > 0 ? 1 + bSize / (originBottomScale * tempContent.height) : 1;
|
|
9279
|
-
correctScaleY *= max$
|
|
9296
|
+
correctScaleY *= max$3(aScale, bScale);
|
|
9280
9297
|
if (lockRatio) {
|
|
9281
|
-
aScale = max$
|
|
9298
|
+
aScale = max$3(abs$7(correctScaleX), abs$7(correctScaleY));
|
|
9282
9299
|
correctScaleX = sign$2(correctScaleX) * aScale;
|
|
9283
9300
|
correctScaleY = sign$2(correctScaleY) * aScale;
|
|
9284
9301
|
}
|
|
9285
9302
|
} else {
|
|
9286
9303
|
if (scale.y < 0) {
|
|
9287
|
-
if (float$
|
|
9304
|
+
if (float$2(minY(content) - minY(dragBounds)) <= 0 || float$2(maxY(dragBounds) - maxY(content)) <= 0) tempContent.scaleOf(origin, 1, correctScaleY = 1 / scale.y);
|
|
9288
9305
|
tempContent.unsign();
|
|
9289
9306
|
}
|
|
9290
|
-
aSize = float$
|
|
9291
|
-
bSize = float$
|
|
9307
|
+
aSize = float$2(tempDragBounds.minY - tempContent.minY);
|
|
9308
|
+
bSize = float$2(tempContent.maxY - tempDragBounds.maxY);
|
|
9292
9309
|
aScale = originTopScale && aSize > 0 ? 1 - aSize / (originTopScale * tempContent.height) : 1;
|
|
9293
9310
|
bScale = originBottomScale && bSize > 0 ? 1 - bSize / (originBottomScale * tempContent.height) : 1;
|
|
9294
|
-
correctScaleY *= min(aScale, bScale);
|
|
9311
|
+
correctScaleY *= min$1(aScale, bScale);
|
|
9295
9312
|
}
|
|
9296
9313
|
scale.x *= isFinite$1(correctScaleX) ? correctScaleX : 1;
|
|
9297
9314
|
scale.y *= isFinite$1(correctScaleY) ? correctScaleY : 1;
|
|
@@ -9397,6 +9414,7 @@ var LeaferUI = function(exports) {
|
|
|
9397
9414
|
exports.MoveEvent.BEFORE_MOVE = "move.before_move";
|
|
9398
9415
|
exports.MoveEvent.START = "move.start";
|
|
9399
9416
|
exports.MoveEvent.MOVE = "move";
|
|
9417
|
+
exports.MoveEvent.DRAG_ANIMATE = "move.drag_animate";
|
|
9400
9418
|
exports.MoveEvent.END = "move.end";
|
|
9401
9419
|
exports.MoveEvent = __decorate([ registerUIEvent() ], exports.MoveEvent);
|
|
9402
9420
|
exports.TouchEvent = class TouchEvent extends UIEvent {};
|
|
@@ -9464,6 +9482,7 @@ var LeaferUI = function(exports) {
|
|
|
9464
9482
|
ctrlKey: e.ctrlKey,
|
|
9465
9483
|
shiftKey: e.shiftKey,
|
|
9466
9484
|
metaKey: e.metaKey,
|
|
9485
|
+
time: Date.now(),
|
|
9467
9486
|
buttons: isUndefined(e.buttons) ? 1 : e.buttons === 0 ? pointerUpButtons : e.buttons,
|
|
9468
9487
|
origin: e
|
|
9469
9488
|
};
|
|
@@ -9495,6 +9514,7 @@ var LeaferUI = function(exports) {
|
|
|
9495
9514
|
const {getDragEventData: getDragEventData, getDropEventData: getDropEventData, getSwipeEventData: getSwipeEventData} = InteractionHelper;
|
|
9496
9515
|
class Dragger {
|
|
9497
9516
|
constructor(interaction) {
|
|
9517
|
+
this.dragDataList = [];
|
|
9498
9518
|
this.interaction = interaction;
|
|
9499
9519
|
}
|
|
9500
9520
|
setDragData(data) {
|
|
@@ -9557,6 +9577,7 @@ var LeaferUI = function(exports) {
|
|
|
9557
9577
|
this.dragData = getDragEventData(downData, dragData, data);
|
|
9558
9578
|
if (throughPath) this.dragData.throughPath = throughPath;
|
|
9559
9579
|
this.dragData.path = path;
|
|
9580
|
+
this.dragDataList.push(this.dragData);
|
|
9560
9581
|
if (this.moving) {
|
|
9561
9582
|
data.moving = true;
|
|
9562
9583
|
this.dragData.moveType = "drag";
|
|
@@ -9607,9 +9628,9 @@ var LeaferUI = function(exports) {
|
|
|
9607
9628
|
interaction.emit(exports.DragEvent.ENTER, data, path, dragEnterPath);
|
|
9608
9629
|
this.dragEnterPath = path;
|
|
9609
9630
|
}
|
|
9610
|
-
dragEnd(data
|
|
9631
|
+
dragEnd(data) {
|
|
9611
9632
|
if (!this.dragging && !this.moving) return;
|
|
9612
|
-
if (this.checkDragEndAnimate(data
|
|
9633
|
+
if (this.checkDragEndAnimate(data)) return;
|
|
9613
9634
|
this.dragEndReal(data);
|
|
9614
9635
|
}
|
|
9615
9636
|
dragEndReal(data) {
|
|
@@ -9651,11 +9672,13 @@ var LeaferUI = function(exports) {
|
|
|
9651
9672
|
}
|
|
9652
9673
|
dragReset() {
|
|
9653
9674
|
exports.DragEvent.list = exports.DragEvent.data = this.draggableList = this.dragData = this.downData = this.dragOverPath = this.dragEnterPath = null;
|
|
9675
|
+
this.dragDataList = [];
|
|
9654
9676
|
}
|
|
9655
9677
|
checkDragEndAnimate(_data, _speed) {
|
|
9656
9678
|
return false;
|
|
9657
9679
|
}
|
|
9658
9680
|
animate(_func, _off) {}
|
|
9681
|
+
stopAnimate() {}
|
|
9659
9682
|
checkDragOut(_data) {}
|
|
9660
9683
|
autoMoveOnDragOut(_data) {}
|
|
9661
9684
|
autoMoveCancel() {}
|
|
@@ -10040,6 +10063,9 @@ var LeaferUI = function(exports) {
|
|
|
10040
10063
|
this.pointerHover(hoverData);
|
|
10041
10064
|
}
|
|
10042
10065
|
}
|
|
10066
|
+
stopDragAnimate() {
|
|
10067
|
+
this.dragger.stopAnimate();
|
|
10068
|
+
}
|
|
10043
10069
|
updateDownData(data, options, merge) {
|
|
10044
10070
|
const {downData: downData} = this;
|
|
10045
10071
|
if (!data && downData) data = downData;
|
|
@@ -10218,14 +10244,13 @@ var LeaferUI = function(exports) {
|
|
|
10218
10244
|
Platform.getSelector = function(leaf) {
|
|
10219
10245
|
return leaf.leafer ? leaf.leafer.selector : Platform.selector || (Platform.selector = Creator.selector());
|
|
10220
10246
|
};
|
|
10221
|
-
const {toInnerRadiusPointOf: toInnerRadiusPointOf,
|
|
10247
|
+
const {toInnerRadiusPointOf: toInnerRadiusPointOf, copyRadiusPoint: copyRadiusPoint} = PointHelper;
|
|
10222
10248
|
const {hitRadiusPoint: hitRadiusPoint, hitPoint: hitPoint} = BoundsHelper;
|
|
10223
10249
|
const inner = {}, worldRadiusPoint = {};
|
|
10224
10250
|
const leaf$1 = exports.Leaf.prototype;
|
|
10225
10251
|
leaf$1.hit = function(worldPoint, hitRadius = 0) {
|
|
10226
10252
|
this.updateLayout();
|
|
10227
|
-
|
|
10228
|
-
setRadius(worldRadiusPoint, hitRadius);
|
|
10253
|
+
copyRadiusPoint(worldRadiusPoint, worldPoint, hitRadius);
|
|
10229
10254
|
const world = this.__world;
|
|
10230
10255
|
if (hitRadius ? !hitRadiusPoint(world, worldRadiusPoint) : !hitPoint(world, worldRadiusPoint)) return false;
|
|
10231
10256
|
return this.isBranch ? Platform.getSelector(this).hitPoint(Object.assign({}, worldRadiusPoint), hitRadius, {
|
|
@@ -10238,8 +10263,8 @@ var LeaferUI = function(exports) {
|
|
|
10238
10263
|
const world = this.__world, layout = this.__layout;
|
|
10239
10264
|
const isSmall = world.width < 10 && world.height < 10;
|
|
10240
10265
|
if (data.hitRadius) {
|
|
10241
|
-
|
|
10242
|
-
|
|
10266
|
+
copyRadiusPoint(inner, point, data.hitRadius);
|
|
10267
|
+
point = inner;
|
|
10243
10268
|
}
|
|
10244
10269
|
toInnerRadiusPointOf(point, world, inner);
|
|
10245
10270
|
if (data.hitBox || isSmall) {
|
|
@@ -10981,10 +11006,12 @@ var LeaferUI = function(exports) {
|
|
|
10981
11006
|
function createPatternTask(paint, ui, canvas, renderOptions) {
|
|
10982
11007
|
if (!paint.patternTask) {
|
|
10983
11008
|
paint.patternTask = ImageManager.patternTasker.add(() => __awaiter(this, void 0, void 0, function*() {
|
|
10984
|
-
paint
|
|
10985
|
-
if (canvas.bounds.hit(ui.__nowWorld)) PaintImage.createPattern(paint, ui, canvas, renderOptions);
|
|
11009
|
+
PaintImage.createPattern(paint, ui, canvas, renderOptions);
|
|
10986
11010
|
ui.forceUpdate("surface");
|
|
10987
|
-
}),
|
|
11011
|
+
}), 0, () => {
|
|
11012
|
+
paint.patternTask = null;
|
|
11013
|
+
return canvas.bounds.hit(ui.__nowWorld);
|
|
11014
|
+
});
|
|
10988
11015
|
}
|
|
10989
11016
|
}
|
|
10990
11017
|
function createPattern(paint, ui, canvas, renderOptions) {
|
|
@@ -11208,7 +11235,7 @@ var LeaferUI = function(exports) {
|
|
|
11208
11235
|
conicGradient: conicGradient,
|
|
11209
11236
|
getTransform: getTransform
|
|
11210
11237
|
};
|
|
11211
|
-
const {copy: copy$3, move: move$6, toOffsetOutBounds: toOffsetOutBounds$1} = BoundsHelper, {max: max$
|
|
11238
|
+
const {copy: copy$3, move: move$6, toOffsetOutBounds: toOffsetOutBounds$1} = BoundsHelper, {max: max$2, abs: abs$5} = Math;
|
|
11212
11239
|
const tempBounds = {}, tempMatrix = new Matrix;
|
|
11213
11240
|
const offsetOutBounds$1 = {};
|
|
11214
11241
|
function shadow$1(ui, current, shape) {
|
|
@@ -11249,10 +11276,10 @@ var LeaferUI = function(exports) {
|
|
|
11249
11276
|
let top = 0, right = 0, bottom = 0, left = 0, x, y, spread, blur;
|
|
11250
11277
|
shadow.forEach(item => {
|
|
11251
11278
|
x = item.x || 0, y = item.y || 0, blur = (item.blur || 0) * 1.5, spread = abs$5(item.spread || 0);
|
|
11252
|
-
top = max$
|
|
11253
|
-
right = max$
|
|
11254
|
-
bottom = max$
|
|
11255
|
-
left = max$
|
|
11279
|
+
top = max$2(top, spread + blur - y);
|
|
11280
|
+
right = max$2(right, spread + blur + x);
|
|
11281
|
+
bottom = max$2(bottom, spread + blur + y);
|
|
11282
|
+
left = max$2(left, spread + blur - x);
|
|
11256
11283
|
});
|
|
11257
11284
|
return top === right && right === bottom && bottom === left ? top : [ top, right, bottom, left ];
|
|
11258
11285
|
}
|
|
@@ -12039,7 +12066,11 @@ var LeaferUI = function(exports) {
|
|
|
12039
12066
|
matrix$1.half = strokeWidth % 2;
|
|
12040
12067
|
canvas.setWorld(matrix$1, options.matrix);
|
|
12041
12068
|
canvas.beginPath();
|
|
12042
|
-
if (
|
|
12069
|
+
if (this.strokePathType === "path") {
|
|
12070
|
+
leaf.__drawPath(canvas);
|
|
12071
|
+
} else {
|
|
12072
|
+
if (leaf.__.__useArrow) leaf.__drawPath(canvas); else leaf.__.__pathForRender ? leaf.__drawRenderPath(canvas) : leaf.__drawPathByBox(canvas);
|
|
12073
|
+
}
|
|
12043
12074
|
data.strokeWidth = strokeWidth / Math.max(aScaleX, aScaleY);
|
|
12044
12075
|
if (stroke) isString(stroke) ? Paint.stroke(stroke, this, canvas, options) : Paint.strokes(stroke, this, canvas, options);
|
|
12045
12076
|
if (fill) isString(fill) ? Paint.fill(fill, this, canvas, options) : Paint.fills(fill, this, canvas, options);
|
|
@@ -12054,6 +12085,7 @@ var LeaferUI = function(exports) {
|
|
|
12054
12085
|
}
|
|
12055
12086
|
}
|
|
12056
12087
|
__decorate([ targetAttr(onTarget$1) ], Stroker.prototype, "target", void 0);
|
|
12088
|
+
__decorate([ surfaceType("render-path") ], Stroker.prototype, "strokePathType", void 0);
|
|
12057
12089
|
function onTarget$1(stroker) {
|
|
12058
12090
|
const value = stroker.target;
|
|
12059
12091
|
stroker.list = value ? isArray(value) ? value : [ value ] : [];
|
|
@@ -12163,10 +12195,11 @@ var LeaferUI = function(exports) {
|
|
|
12163
12195
|
}
|
|
12164
12196
|
update() {
|
|
12165
12197
|
this.hoverStroker.update();
|
|
12166
|
-
const {stroke: stroke, strokeWidth: strokeWidth, selectedStyle: selectedStyle} = this.editor.mergedConfig;
|
|
12198
|
+
const {stroke: stroke, strokeWidth: strokeWidth, selectedPathType: selectedPathType, selectedStyle: selectedStyle} = this.editor.mergedConfig;
|
|
12167
12199
|
this.targetStroker.update(Object.assign({
|
|
12168
12200
|
stroke: stroke,
|
|
12169
|
-
strokeWidth: strokeWidth && Math.max(1, strokeWidth / 2)
|
|
12201
|
+
strokeWidth: strokeWidth && Math.max(1, strokeWidth / 2),
|
|
12202
|
+
strokePathType: selectedPathType
|
|
12170
12203
|
}, selectedStyle || {}));
|
|
12171
12204
|
}
|
|
12172
12205
|
onPointerMove(e) {
|
|
@@ -13492,7 +13525,7 @@ var LeaferUI = function(exports) {
|
|
|
13492
13525
|
const {target: target, mergeConfig: mergeConfig, single: single, dragStartData: dragStartData} = this.editBox;
|
|
13493
13526
|
let {around: around, lockRatio: lockRatio, flipable: flipable, editSize: editSize} = mergeConfig, totalMove;
|
|
13494
13527
|
if (e instanceof exports.ZoomEvent) {
|
|
13495
|
-
around = target.getBoxPoint(e);
|
|
13528
|
+
if (!around) around = target.getBoxPoint(e);
|
|
13496
13529
|
totalMove = e.totalScale;
|
|
13497
13530
|
} else {
|
|
13498
13531
|
totalMove = e.getInnerTotal(target);
|
|
@@ -14749,7 +14782,11 @@ var LeaferUI = function(exports) {
|
|
|
14749
14782
|
addViewportConfig(leafer.parentApp ? leafer.parentApp : leafer, mergeConfig);
|
|
14750
14783
|
if (leafer.isApp || custom) return;
|
|
14751
14784
|
leafer.__eventIds.push(leafer.on_(exports.MoveEvent.BEFORE_MOVE, e => {
|
|
14752
|
-
|
|
14785
|
+
const move = leafer.getValidMove(e.moveX, e.moveY, false);
|
|
14786
|
+
leafer.zoomLayer.move(move);
|
|
14787
|
+
}), leafer.on_(exports.MoveEvent.DRAG_ANIMATE, () => {
|
|
14788
|
+
const move = leafer.getValidMove(0, 0);
|
|
14789
|
+
if (move.x || move.y) leafer.interaction.stopDragAnimate();
|
|
14753
14790
|
}), leafer.on_(exports.MoveEvent.END, e => {
|
|
14754
14791
|
LeafHelper.animateMove(leafer.zoomLayer, leafer.getValidMove(e.moveX, e.moveY));
|
|
14755
14792
|
}), leafer.on_(exports.ZoomEvent.BEFORE_ZOOM, e => {
|
|
@@ -14886,7 +14923,7 @@ var LeaferUI = function(exports) {
|
|
|
14886
14923
|
}
|
|
14887
14924
|
};
|
|
14888
14925
|
const M$3 = MultiTouchHelper;
|
|
14889
|
-
const {abs: abs$2, max: max} = Math, {sign: sign, within: within$2} = MathHelper;
|
|
14926
|
+
const {abs: abs$2, max: max$1} = Math, {sign: sign, within: within$2} = MathHelper;
|
|
14890
14927
|
const WheelEventHelper = {
|
|
14891
14928
|
getMove(event, config) {
|
|
14892
14929
|
let {moveSpeed: moveSpeed} = config;
|
|
@@ -14896,8 +14933,8 @@ var LeaferUI = function(exports) {
|
|
|
14896
14933
|
deltaY = 0;
|
|
14897
14934
|
}
|
|
14898
14935
|
const absX = abs$2(deltaX), absY = abs$2(deltaY);
|
|
14899
|
-
if (absX > 50) deltaX = max(50, absX / 3) * sign(deltaX);
|
|
14900
|
-
if (absY > 50) deltaY = max(50, absY / 3) * sign(deltaY);
|
|
14936
|
+
if (absX > 50) deltaX = max$1(50, absX / 3) * sign(deltaX);
|
|
14937
|
+
if (absY > 50) deltaY = max$1(50, absY / 3) * sign(deltaY);
|
|
14901
14938
|
return {
|
|
14902
14939
|
x: -deltaX * moveSpeed * 2,
|
|
14903
14940
|
y: -deltaY * moveSpeed * 2
|
|
@@ -15041,7 +15078,7 @@ var LeaferUI = function(exports) {
|
|
|
15041
15078
|
if (type.includes("x")) move$4.y = 0; else if (type.includes("y")) move$4.x = 0; else Math.abs(move$4.x) > Math.abs(move$4.y) ? move$4.y = 0 : move$4.x = 0;
|
|
15042
15079
|
if (checkLimit && type.includes("limit")) {
|
|
15043
15080
|
bounds.set(this.__world).addPoint(this.zoomLayer);
|
|
15044
|
-
DragBoundsHelper.getValidMove(bounds, this.canvas.bounds, "
|
|
15081
|
+
DragBoundsHelper.getValidMove(bounds, this.canvas.bounds, "auto", move$4, true);
|
|
15045
15082
|
if (type.includes("x")) move$4.y = 0; else if (type.includes("y")) move$4.x = 0;
|
|
15046
15083
|
}
|
|
15047
15084
|
}
|
|
@@ -15135,21 +15172,51 @@ var LeaferUI = function(exports) {
|
|
|
15135
15172
|
if (moving) this.move(getMoveEventData(gestureData.move, data));
|
|
15136
15173
|
};
|
|
15137
15174
|
const dragger = Dragger.prototype;
|
|
15138
|
-
const {abs: abs$1} = Math;
|
|
15139
|
-
dragger.checkDragEndAnimate = function(data
|
|
15140
|
-
const {
|
|
15141
|
-
const
|
|
15142
|
-
const dragAnimate = this.canAnimate && this.moving && (absMoveX > minMove || absMoveY > minMove) && this.interaction.m.dragAnimate;
|
|
15175
|
+
const {abs: abs$1, min: min, max: max, hypot: hypot} = Math;
|
|
15176
|
+
dragger.checkDragEndAnimate = function(data) {
|
|
15177
|
+
const {interaction: interaction} = this;
|
|
15178
|
+
const dragAnimate = this.canAnimate && this.moving && interaction.m.dragAnimate;
|
|
15143
15179
|
if (dragAnimate) {
|
|
15144
|
-
const inertia =
|
|
15145
|
-
|
|
15146
|
-
|
|
15147
|
-
|
|
15148
|
-
|
|
15149
|
-
this.
|
|
15150
|
-
|
|
15151
|
-
|
|
15152
|
-
|
|
15180
|
+
const inertia = isNumber(dragAnimate) ? dragAnimate : .95;
|
|
15181
|
+
const stopMove = .15;
|
|
15182
|
+
const maxMove = 150;
|
|
15183
|
+
let moveX = 0, moveY = 0, flickSpeed = 0;
|
|
15184
|
+
let totalWeight = 0, weight, w = 3, s, frame;
|
|
15185
|
+
const {dragDataList: dragDataList} = this, len = dragDataList.length;
|
|
15186
|
+
for (let i = len - 1; i >= max(len - 3, 0); i--) {
|
|
15187
|
+
frame = dragDataList[i];
|
|
15188
|
+
if (frame.time && Date.now() - frame.time > 100) break;
|
|
15189
|
+
weight = w--;
|
|
15190
|
+
moveX += frame.moveX * weight;
|
|
15191
|
+
moveY += frame.moveY * weight;
|
|
15192
|
+
totalWeight += weight;
|
|
15193
|
+
s = hypot(frame.moveX, frame.moveY);
|
|
15194
|
+
if (s > flickSpeed) flickSpeed = s;
|
|
15195
|
+
}
|
|
15196
|
+
if (totalWeight) moveX /= totalWeight, moveY /= totalWeight;
|
|
15197
|
+
if (flickSpeed > 8) {
|
|
15198
|
+
const t = min((flickSpeed - 8) / 17, 1);
|
|
15199
|
+
const boost = 1.15 + t * (1.6 - 1.15);
|
|
15200
|
+
moveX *= boost;
|
|
15201
|
+
moveY *= boost;
|
|
15202
|
+
}
|
|
15203
|
+
const maxAbs = max(abs$1(moveX), abs$1(moveY));
|
|
15204
|
+
if (maxAbs > maxMove) {
|
|
15205
|
+
s = maxMove / maxAbs;
|
|
15206
|
+
moveX *= s;
|
|
15207
|
+
moveY *= s;
|
|
15208
|
+
}
|
|
15209
|
+
const step = () => {
|
|
15210
|
+
moveX *= inertia;
|
|
15211
|
+
moveY *= inertia;
|
|
15212
|
+
data = Object.assign({}, data);
|
|
15213
|
+
if (abs$1(moveX) < stopMove && abs$1(moveY) < stopMove) return this.dragEndReal(data);
|
|
15214
|
+
PointHelper.move(data, moveX, moveY);
|
|
15215
|
+
this.drag(data);
|
|
15216
|
+
this.animate(step);
|
|
15217
|
+
interaction.emit(exports.MoveEvent.DRAG_ANIMATE, data);
|
|
15218
|
+
};
|
|
15219
|
+
this.animate(step);
|
|
15153
15220
|
}
|
|
15154
15221
|
return dragAnimate;
|
|
15155
15222
|
};
|
|
@@ -15158,6 +15225,12 @@ var LeaferUI = function(exports) {
|
|
|
15158
15225
|
if (animateWait) this.interaction.target.nextRender(animateWait, null, off);
|
|
15159
15226
|
this.animateWait = func;
|
|
15160
15227
|
};
|
|
15228
|
+
dragger.stopAnimate = function() {
|
|
15229
|
+
this.animate(null, "off");
|
|
15230
|
+
this.interaction.target.nextRender(() => {
|
|
15231
|
+
if (this.dragData) this.dragEndReal(this.dragData);
|
|
15232
|
+
});
|
|
15233
|
+
};
|
|
15161
15234
|
dragger.checkDragOut = function(data) {
|
|
15162
15235
|
const {interaction: interaction} = this;
|
|
15163
15236
|
this.autoMoveCancel();
|
|
@@ -15222,7 +15295,6 @@ var LeaferUI = function(exports) {
|
|
|
15222
15295
|
}
|
|
15223
15296
|
Plugin.add("view");
|
|
15224
15297
|
exports.Leafer.prototype.zoom = function(zoomType, optionsOrPadding, scroll, transition) {
|
|
15225
|
-
this.killAnimate();
|
|
15226
15298
|
let padding;
|
|
15227
15299
|
if (isData(optionsOrPadding)) {
|
|
15228
15300
|
padding = optionsOrPadding.padding;
|
|
@@ -15235,8 +15307,9 @@ var LeaferUI = function(exports) {
|
|
|
15235
15307
|
x: limitBounds.x + limitBounds.width / 2,
|
|
15236
15308
|
y: limitBounds.y + limitBounds.height / 2
|
|
15237
15309
|
};
|
|
15310
|
+
zoomLayer.killAnimate();
|
|
15238
15311
|
let changeScale;
|
|
15239
|
-
const {x: x, y: y, scaleX: scaleX, scaleY: scaleY} = zoomLayer.__;
|
|
15312
|
+
const {x: x, y: y, scaleX: scaleX, scaleY: scaleY} = zoomLayer.__, {boxBounds: boxBounds} = zoomLayer;
|
|
15240
15313
|
if (isString(zoomType)) {
|
|
15241
15314
|
switch (zoomType) {
|
|
15242
15315
|
case "in":
|
|
@@ -15248,16 +15321,16 @@ var LeaferUI = function(exports) {
|
|
|
15248
15321
|
break;
|
|
15249
15322
|
|
|
15250
15323
|
case "fit":
|
|
15251
|
-
zoomType =
|
|
15324
|
+
zoomType = boxBounds;
|
|
15252
15325
|
break;
|
|
15253
15326
|
|
|
15254
15327
|
case "fit-width":
|
|
15255
|
-
zoomType = new Bounds(
|
|
15328
|
+
zoomType = new Bounds(boxBounds);
|
|
15256
15329
|
zoomType.height = 0;
|
|
15257
15330
|
break;
|
|
15258
15331
|
|
|
15259
15332
|
case "fit-height":
|
|
15260
|
-
zoomType = new Bounds(
|
|
15333
|
+
zoomType = new Bounds(boxBounds);
|
|
15261
15334
|
zoomType.width = 0;
|
|
15262
15335
|
break;
|
|
15263
15336
|
}
|
|
@@ -16524,6 +16597,8 @@ var LeaferUI = function(exports) {
|
|
|
16524
16597
|
}
|
|
16525
16598
|
constructor(target, keyframe, options, isTemp) {
|
|
16526
16599
|
super();
|
|
16600
|
+
this.nowIndex = 0;
|
|
16601
|
+
this.playedTotalTime = 0;
|
|
16527
16602
|
if (keyframe) {
|
|
16528
16603
|
if (keyframe.keyframes) options = keyframe, keyframe = keyframe.keyframes; else if (keyframe.style) options = keyframe,
|
|
16529
16604
|
keyframe = keyframe.style;
|
|
@@ -16570,7 +16645,7 @@ var LeaferUI = function(exports) {
|
|
|
16570
16645
|
play() {
|
|
16571
16646
|
if (this.destroyed) return;
|
|
16572
16647
|
this.running = true;
|
|
16573
|
-
if (!this.started) this.clearTimer(), this.start(); else if (!this.timer) this.
|
|
16648
|
+
if (!this.started) this.clearTimer(), this.start(); else if (!this.timer) this.startRequestAnimate();
|
|
16574
16649
|
this.emitType(AnimateEvent.PLAY);
|
|
16575
16650
|
}
|
|
16576
16651
|
pause() {
|
|
@@ -16584,14 +16659,28 @@ var LeaferUI = function(exports) {
|
|
|
16584
16659
|
this.complete();
|
|
16585
16660
|
this.emitType(AnimateEvent.STOP);
|
|
16586
16661
|
}
|
|
16587
|
-
seek(time) {
|
|
16662
|
+
seek(time, includeDelay) {
|
|
16588
16663
|
if (this.destroyed) return;
|
|
16589
|
-
|
|
16664
|
+
const {delay: delay} = this;
|
|
16665
|
+
if (isObject(time)) time = UnitConvert.number(time, this.duration + (includeDelay ? delay : 0));
|
|
16666
|
+
if (includeDelay) time -= delay;
|
|
16590
16667
|
if (time) time /= this.speed;
|
|
16591
|
-
|
|
16668
|
+
let waitBeginTime;
|
|
16669
|
+
if (time < 0) {
|
|
16670
|
+
waitBeginTime = -time;
|
|
16671
|
+
time = 0;
|
|
16672
|
+
}
|
|
16673
|
+
if (!this.started || time < this.time || !time) this.start(true);
|
|
16592
16674
|
this.time = time;
|
|
16593
|
-
this.animate(0, true);
|
|
16594
|
-
this.clearTimer(() =>
|
|
16675
|
+
if (!waitBeginTime) this.animate(0, true);
|
|
16676
|
+
this.clearTimer(() => {
|
|
16677
|
+
if (waitBeginTime) {
|
|
16678
|
+
this.timer = setTimeout(() => {
|
|
16679
|
+
this.timer = 0;
|
|
16680
|
+
this.begin();
|
|
16681
|
+
}, waitBeginTime * 1e3);
|
|
16682
|
+
} else this.startRequestAnimate();
|
|
16683
|
+
});
|
|
16595
16684
|
this.emitType(AnimateEvent.SEEK);
|
|
16596
16685
|
}
|
|
16597
16686
|
kill(complete = true, killStyle) {
|
|
@@ -16674,14 +16763,24 @@ var LeaferUI = function(exports) {
|
|
|
16674
16763
|
}
|
|
16675
16764
|
}
|
|
16676
16765
|
}
|
|
16677
|
-
|
|
16766
|
+
startRequestAnimate() {
|
|
16678
16767
|
this.requestAnimateTime = Date.now();
|
|
16768
|
+
this.requestAnimatePageTime = 0;
|
|
16769
|
+
if (!this.waitRequestRender) this.requestAnimate();
|
|
16770
|
+
}
|
|
16771
|
+
requestAnimate() {
|
|
16772
|
+
this.waitRequestRender = true;
|
|
16679
16773
|
Platform.requestRender(this.animate.bind(this));
|
|
16680
16774
|
}
|
|
16681
|
-
animate(
|
|
16775
|
+
animate(pageTime, seek) {
|
|
16682
16776
|
if (!seek) {
|
|
16777
|
+
this.waitRequestRender = false;
|
|
16683
16778
|
if (!this.running) return;
|
|
16684
|
-
|
|
16779
|
+
let frameTime;
|
|
16780
|
+
if (pageTime && this.requestAnimatePageTime) frameTime = pageTime - this.requestAnimatePageTime; else frameTime = Date.now() - this.requestAnimateTime;
|
|
16781
|
+
this.time += frameTime / 1e3;
|
|
16782
|
+
this.requestAnimatePageTime = pageTime;
|
|
16783
|
+
this.requestAnimateTime = Date.now();
|
|
16685
16784
|
}
|
|
16686
16785
|
const {duration: duration} = this, realTime = this.time * this.speed;
|
|
16687
16786
|
if (realTime < duration) {
|
|
@@ -16722,21 +16821,24 @@ var LeaferUI = function(exports) {
|
|
|
16722
16821
|
}
|
|
16723
16822
|
start(seek) {
|
|
16724
16823
|
this.requestAnimateTime = 1;
|
|
16725
|
-
const {reverse: reverse} = this;
|
|
16824
|
+
const {reverse: reverse, jump: jump} = this;
|
|
16726
16825
|
if (reverse || this.mainReverse) this.mainReverse = reverse;
|
|
16727
16826
|
if (this.looped) this.looped = 0;
|
|
16728
16827
|
if (seek) this.begin(true); else {
|
|
16729
16828
|
const {delay: delay} = this;
|
|
16730
|
-
if (delay)
|
|
16731
|
-
this.
|
|
16732
|
-
this.
|
|
16733
|
-
|
|
16829
|
+
if (delay) {
|
|
16830
|
+
if (jump) this.begin(true);
|
|
16831
|
+
this.timer = setTimeout(() => {
|
|
16832
|
+
this.timer = 0;
|
|
16833
|
+
this.begin();
|
|
16834
|
+
}, delay / this.speed * 1e3);
|
|
16835
|
+
} else this.begin();
|
|
16734
16836
|
}
|
|
16735
16837
|
}
|
|
16736
16838
|
begin(seek) {
|
|
16737
16839
|
this.playedTotalTime = this.time = 0;
|
|
16738
16840
|
this.mainReverse ? this.setTo() : this.setFrom();
|
|
16739
|
-
if (!seek) this.
|
|
16841
|
+
if (!seek) this.startRequestAnimate();
|
|
16740
16842
|
}
|
|
16741
16843
|
end() {
|
|
16742
16844
|
this.mainReverse ? this.setFrom() : this.setTo();
|
|
@@ -16840,6 +16942,7 @@ var LeaferUI = function(exports) {
|
|
|
16840
16942
|
__decorate([ animateAttr(1) ], exports.Animate.prototype, "speed", void 0);
|
|
16841
16943
|
__decorate([ animateAttr(true) ], exports.Animate.prototype, "autoplay", void 0);
|
|
16842
16944
|
__decorate([ animateAttr() ], exports.Animate.prototype, "join", void 0);
|
|
16945
|
+
__decorate([ animateAttr() ], exports.Animate.prototype, "jump", void 0);
|
|
16843
16946
|
__decorate([ animateAttr() ], exports.Animate.prototype, "attrs", void 0);
|
|
16844
16947
|
exports.Animate = __decorate([ useModule(LeafEventer) ], exports.Animate);
|
|
16845
16948
|
exports.AnimateList = class AnimateList extends exports.Animate {
|
|
@@ -17069,7 +17172,7 @@ var LeaferUI = function(exports) {
|
|
|
17069
17172
|
const rgbaMatch = /^rgba\((\d+),\s*(\d+),\s*(\d+),\s*(\d*\.?\d+)/i;
|
|
17070
17173
|
const hslMatch = /^hsl\((\d+),\s*(\d+)%\s*,\s*(\d+)%/i;
|
|
17071
17174
|
const hslaMatch = /^hsla\((\d+),\s*(\d+)%\s*,\s*(\d+)%\s*,\s*(\d*\.?\d+)/i;
|
|
17072
|
-
const int = parseInt, float = parseFloat, {round: round$1} = Math;
|
|
17175
|
+
const int = parseInt, float$1 = parseFloat, {round: round$1} = Math;
|
|
17073
17176
|
let cache = {}, totalCache = 0;
|
|
17074
17177
|
function colorToRGBA(color, opacity) {
|
|
17075
17178
|
let RGBA;
|
|
@@ -17177,16 +17280,16 @@ var LeaferUI = function(exports) {
|
|
|
17177
17280
|
r: int(match[1]),
|
|
17178
17281
|
g: int(match[2]),
|
|
17179
17282
|
b: int(match[3]),
|
|
17180
|
-
a: float(match[4])
|
|
17283
|
+
a: float$1(match[4])
|
|
17181
17284
|
};
|
|
17182
17285
|
}
|
|
17183
17286
|
function hslToRGBA(color) {
|
|
17184
17287
|
const match = hslMatch.exec(color);
|
|
17185
|
-
return hsla(float(match[1]), float(match[2]), float(match[3]), 1);
|
|
17288
|
+
return hsla(float$1(match[1]), float$1(match[2]), float$1(match[3]), 1);
|
|
17186
17289
|
}
|
|
17187
17290
|
function hslaToRGBA(color) {
|
|
17188
17291
|
const match = hslaMatch.exec(color);
|
|
17189
|
-
return hsla(float(match[1]), float(match[2]), float(match[3]), float(match[4]));
|
|
17292
|
+
return hsla(float$1(match[1]), float$1(match[2]), float$1(match[3]), float$1(match[4]));
|
|
17190
17293
|
}
|
|
17191
17294
|
const n1 = 1 / 6, n2 = .5, n3 = 2 / 3, n4 = 1 / 3;
|
|
17192
17295
|
function hue(p, q, t) {
|
|
@@ -17389,7 +17492,7 @@ var LeaferUI = function(exports) {
|
|
|
17389
17492
|
}
|
|
17390
17493
|
};
|
|
17391
17494
|
const {getDistance: getDistance} = HighBezierHelper;
|
|
17392
|
-
const {M: M, L: L, C: C, Z: Z} = PathCommandMap;
|
|
17495
|
+
const {M: M, L: L, C: C, Z: Z} = PathCommandMap, {float: float} = MathHelper;
|
|
17393
17496
|
const tempPoint = {}, tempFrom = {};
|
|
17394
17497
|
const HighCurveHelper = {
|
|
17395
17498
|
transform(data, matrix) {
|
|
@@ -17524,7 +17627,7 @@ var LeaferUI = function(exports) {
|
|
|
17524
17627
|
getDistancePath(distanceData, motionDistance, motionPrecision) {
|
|
17525
17628
|
const {segments: segments, data: data} = distanceData, path = [];
|
|
17526
17629
|
motionDistance = UnitConvert.number(motionDistance, distanceData.total);
|
|
17527
|
-
let total = 0, distance, to = {};
|
|
17630
|
+
let total = 0, distance, cutDistance, to = {};
|
|
17528
17631
|
let i = 0, index = 0, x = 0, y = 0, toX, toY, command;
|
|
17529
17632
|
let x1, y1, x2, y2, t;
|
|
17530
17633
|
const len = data.length;
|
|
@@ -17536,14 +17639,17 @@ var LeaferUI = function(exports) {
|
|
|
17536
17639
|
toX = data[i + 1];
|
|
17537
17640
|
toY = data[i + 2];
|
|
17538
17641
|
distance = segments[index];
|
|
17539
|
-
if (total + distance
|
|
17642
|
+
if (total + distance > motionDistance || !distanceData.total) {
|
|
17540
17643
|
if (!i) x = toX, y = toY;
|
|
17541
17644
|
tempFrom.x = x;
|
|
17542
17645
|
tempFrom.y = y;
|
|
17543
17646
|
to.x = toX;
|
|
17544
17647
|
to.y = toY;
|
|
17545
|
-
|
|
17546
|
-
|
|
17648
|
+
cutDistance = float(motionDistance - total);
|
|
17649
|
+
if (cutDistance) {
|
|
17650
|
+
PointHelper.getDistancePoint(tempFrom, to, cutDistance, true);
|
|
17651
|
+
path.push(command, to.x, to.y);
|
|
17652
|
+
}
|
|
17547
17653
|
return path;
|
|
17548
17654
|
}
|
|
17549
17655
|
x = toX;
|
|
@@ -17557,9 +17663,12 @@ var LeaferUI = function(exports) {
|
|
|
17557
17663
|
toX = data[i + 5];
|
|
17558
17664
|
toY = data[i + 6];
|
|
17559
17665
|
distance = segments[index];
|
|
17560
|
-
if (total + distance
|
|
17561
|
-
|
|
17562
|
-
|
|
17666
|
+
if (total + distance > motionDistance) {
|
|
17667
|
+
cutDistance = float(motionDistance - total);
|
|
17668
|
+
if (cutDistance) {
|
|
17669
|
+
t = HighBezierHelper.getT(cutDistance, distance, x, y, x1, y1, x2, y2, toX, toY, motionPrecision);
|
|
17670
|
+
HighBezierHelper.cut(path, t, x, y, x1, y1, x2, y2, toX, toY);
|
|
17671
|
+
}
|
|
17563
17672
|
return path;
|
|
17564
17673
|
}
|
|
17565
17674
|
x = toX;
|
|
@@ -18202,6 +18311,7 @@ var LeaferUI = function(exports) {
|
|
|
18202
18311
|
for (let i = 0, len = children.length; i < len; i++) {
|
|
18203
18312
|
child = children[i];
|
|
18204
18313
|
result = method(child, options);
|
|
18314
|
+
if (typeof result === "boolean") result = result ? 1 : 0;
|
|
18205
18315
|
if (result === Yes || result === YesAndSkip) {
|
|
18206
18316
|
if (list) {
|
|
18207
18317
|
list.push(child);
|
|
@@ -18747,7 +18857,7 @@ var LeaferUI = function(exports) {
|
|
|
18747
18857
|
exports.surfaceType = surfaceType;
|
|
18748
18858
|
exports.tempBounds = tempBounds$2;
|
|
18749
18859
|
exports.tempMatrix = tempMatrix$2;
|
|
18750
|
-
exports.tempPoint = tempPoint$
|
|
18860
|
+
exports.tempPoint = tempPoint$4;
|
|
18751
18861
|
exports.tryToNumber = tryToNumber;
|
|
18752
18862
|
exports.useCanvas = useCanvas;
|
|
18753
18863
|
exports.useModule = useModule;
|