@leafer-ui/worker 1.5.3 → 1.6.1
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.cjs +73 -75
- package/dist/worker.cjs.map +1 -1
- package/dist/worker.esm.js +73 -75
- package/dist/worker.esm.js.map +1 -1
- package/dist/worker.esm.min.js +1 -1
- package/dist/worker.esm.min.js.map +1 -1
- package/dist/worker.js +317 -202
- package/dist/worker.js.map +1 -1
- package/dist/worker.min.cjs +1 -1
- package/dist/worker.min.cjs.map +1 -1
- package/dist/worker.min.js +1 -1
- package/dist/worker.min.js.map +1 -1
- package/dist/worker.module.js +317 -202
- package/dist/worker.module.js.map +1 -1
- package/dist/worker.module.min.js +1 -1
- package/dist/worker.module.min.js.map +1 -1
- package/package.json +11 -10
- package/src/core.ts +86 -0
- package/src/index.ts +2 -2
- package/types/index.d.ts +8 -1
package/dist/worker.js
CHANGED
|
@@ -48,7 +48,7 @@ var LeaferUI = (function (exports) {
|
|
|
48
48
|
};
|
|
49
49
|
const I$2 = IncrementId;
|
|
50
50
|
|
|
51
|
-
const { round, pow: pow$1, PI: PI$4 } = Math;
|
|
51
|
+
const { round: round$3, pow: pow$1, PI: PI$4 } = Math;
|
|
52
52
|
const MathHelper = {
|
|
53
53
|
within(value, min, max) {
|
|
54
54
|
if (typeof min === 'object')
|
|
@@ -112,7 +112,7 @@ var LeaferUI = (function (exports) {
|
|
|
112
112
|
},
|
|
113
113
|
float(num, maxLength) {
|
|
114
114
|
const a = maxLength !== undefined ? pow$1(10, maxLength) : 1000000000000;
|
|
115
|
-
num = round(num * a) / a;
|
|
115
|
+
num = round$3(num * a) / a;
|
|
116
116
|
return num === -0 ? 0 : num;
|
|
117
117
|
},
|
|
118
118
|
getScaleData(scale, size, originSize, scaleData) {
|
|
@@ -135,8 +135,15 @@ var LeaferUI = (function (exports) {
|
|
|
135
135
|
scaleData.scaleX = scale.x;
|
|
136
136
|
scaleData.scaleY = scale.y;
|
|
137
137
|
}
|
|
138
|
+
},
|
|
139
|
+
randInt,
|
|
140
|
+
randColor(opacity) {
|
|
141
|
+
return `rgba(${randInt(255)},${randInt(255)},${randInt(255)},${opacity || 1})`;
|
|
138
142
|
}
|
|
139
143
|
};
|
|
144
|
+
function randInt(num) {
|
|
145
|
+
return Math.round(Math.random() * num);
|
|
146
|
+
}
|
|
140
147
|
const OneRadian = PI$4 / 180;
|
|
141
148
|
const PI2 = PI$4 * 2;
|
|
142
149
|
const PI_2 = PI$4 / 2;
|
|
@@ -434,7 +441,7 @@ var LeaferUI = (function (exports) {
|
|
|
434
441
|
const M$6 = MatrixHelper;
|
|
435
442
|
|
|
436
443
|
const { toInnerPoint: toInnerPoint$2, toOuterPoint: toOuterPoint$3 } = MatrixHelper;
|
|
437
|
-
const { sin: sin$4, cos: cos$4, abs: abs$4, sqrt: sqrt$2, atan2: atan2$2, min: min$1, PI: PI$3 } = Math;
|
|
444
|
+
const { sin: sin$4, cos: cos$4, abs: abs$4, sqrt: sqrt$2, atan2: atan2$2, min: min$1, round: round$2, PI: PI$3 } = Math;
|
|
438
445
|
const PointHelper = {
|
|
439
446
|
defaultPoint: getPointData(),
|
|
440
447
|
tempPoint: {},
|
|
@@ -455,6 +462,10 @@ var LeaferUI = (function (exports) {
|
|
|
455
462
|
t.x = x;
|
|
456
463
|
t.y = y;
|
|
457
464
|
},
|
|
465
|
+
round(t, halfPixel) {
|
|
466
|
+
t.x = halfPixel ? round$2(t.x - 0.5) + 0.5 : round$2(t.x);
|
|
467
|
+
t.y = halfPixel ? round$2(t.y - 0.5) + 0.5 : round$2(t.y);
|
|
468
|
+
},
|
|
458
469
|
move(t, x, y) {
|
|
459
470
|
t.x += x;
|
|
460
471
|
t.y += y;
|
|
@@ -1320,6 +1331,7 @@ var LeaferUI = (function (exports) {
|
|
|
1320
1331
|
'E': 1
|
|
1321
1332
|
};
|
|
1322
1333
|
|
|
1334
|
+
const { randColor } = MathHelper;
|
|
1323
1335
|
class Debug {
|
|
1324
1336
|
constructor(name) {
|
|
1325
1337
|
this.repeatMap = {};
|
|
@@ -1334,6 +1346,19 @@ var LeaferUI = (function (exports) {
|
|
|
1334
1346
|
static set exclude(name) {
|
|
1335
1347
|
this.excludeList = getNameList(name);
|
|
1336
1348
|
}
|
|
1349
|
+
static drawRepaint(canvas, bounds) {
|
|
1350
|
+
const color = randColor();
|
|
1351
|
+
canvas.fillWorld(bounds, color.replace('1)', '.1)'));
|
|
1352
|
+
canvas.strokeWorld(bounds, color);
|
|
1353
|
+
}
|
|
1354
|
+
static drawBounds(leaf, canvas, _options) {
|
|
1355
|
+
const showHit = Debug.showBounds === 'hit', w = leaf.__nowWorld, color = randColor();
|
|
1356
|
+
if (showHit)
|
|
1357
|
+
canvas.setWorld(w), leaf.__drawHitPath(canvas), canvas.fillStyle = color.replace('1)', '.2)'), canvas.fill();
|
|
1358
|
+
canvas.resetTransform();
|
|
1359
|
+
canvas.setStroke(color, 2);
|
|
1360
|
+
showHit ? canvas.stroke() : canvas.strokeWorld(w, color);
|
|
1361
|
+
}
|
|
1337
1362
|
log(...messages) {
|
|
1338
1363
|
if (D$4.enable) {
|
|
1339
1364
|
if (D$4.filterList.length && D$4.filterList.every(name => name !== this.name))
|
|
@@ -1420,7 +1445,7 @@ var LeaferUI = (function (exports) {
|
|
|
1420
1445
|
return rs;
|
|
1421
1446
|
},
|
|
1422
1447
|
need(name) {
|
|
1423
|
-
console.error('
|
|
1448
|
+
console.error('please install plugin: ' + (name.includes('-x') ? '' : '@leafer-in/') + name);
|
|
1424
1449
|
}
|
|
1425
1450
|
};
|
|
1426
1451
|
setTimeout(() => check.forEach(name => Plugin.has(name, true)));
|
|
@@ -2020,7 +2045,7 @@ var LeaferUI = (function (exports) {
|
|
|
2020
2045
|
contextMethod()
|
|
2021
2046
|
], Canvas.prototype, "strokeText", null);
|
|
2022
2047
|
|
|
2023
|
-
const { copy: copy$9 } = MatrixHelper;
|
|
2048
|
+
const { copy: copy$9, multiplyParent: multiplyParent$3 } = MatrixHelper, { round: round$1 } = Math;
|
|
2024
2049
|
const minSize = { width: 1, height: 1, pixelRatio: 1 };
|
|
2025
2050
|
const canvasSizeAttrs = ['width', 'height', 'pixelRatio'];
|
|
2026
2051
|
class LeaferCanvasBase extends Canvas {
|
|
@@ -2029,6 +2054,8 @@ var LeaferUI = (function (exports) {
|
|
|
2029
2054
|
get pixelRatio() { return this.size.pixelRatio; }
|
|
2030
2055
|
get pixelWidth() { return this.width * this.pixelRatio; }
|
|
2031
2056
|
get pixelHeight() { return this.height * this.pixelRatio; }
|
|
2057
|
+
get pixelSnap() { return this.config.pixelSnap; }
|
|
2058
|
+
set pixelSnap(value) { this.config.pixelSnap = value; }
|
|
2032
2059
|
get allowBackgroundColor() { return this.view && this.parentView; }
|
|
2033
2060
|
constructor(config, manager) {
|
|
2034
2061
|
super();
|
|
@@ -2089,15 +2116,22 @@ var LeaferUI = (function (exports) {
|
|
|
2089
2116
|
stopAutoLayout() { }
|
|
2090
2117
|
setCursor(_cursor) { }
|
|
2091
2118
|
setWorld(matrix, parentMatrix) {
|
|
2092
|
-
const { pixelRatio } = this;
|
|
2093
|
-
|
|
2094
|
-
|
|
2095
|
-
|
|
2096
|
-
|
|
2097
|
-
|
|
2098
|
-
|
|
2099
|
-
|
|
2119
|
+
const { pixelRatio, pixelSnap } = this, w = this.worldTransform;
|
|
2120
|
+
if (parentMatrix)
|
|
2121
|
+
multiplyParent$3(matrix, parentMatrix, w);
|
|
2122
|
+
w.a = matrix.a * pixelRatio;
|
|
2123
|
+
w.b = matrix.b * pixelRatio;
|
|
2124
|
+
w.c = matrix.c * pixelRatio;
|
|
2125
|
+
w.d = matrix.d * pixelRatio;
|
|
2126
|
+
w.e = matrix.e * pixelRatio;
|
|
2127
|
+
w.f = matrix.f * pixelRatio;
|
|
2128
|
+
if (pixelSnap) {
|
|
2129
|
+
if (matrix.half && (matrix.half * pixelRatio) % 2)
|
|
2130
|
+
w.e = round$1(w.e - 0.5) + 0.5, w.f = round$1(w.f - 0.5) + 0.5;
|
|
2131
|
+
else
|
|
2132
|
+
w.e = round$1(w.e), w.f = round$1(w.f);
|
|
2100
2133
|
}
|
|
2134
|
+
this.setTransform(w.a, w.b, w.c, w.d, w.e, w.f);
|
|
2101
2135
|
}
|
|
2102
2136
|
useWorldTransform(worldTransform) {
|
|
2103
2137
|
if (worldTransform)
|
|
@@ -2240,12 +2274,13 @@ var LeaferUI = (function (exports) {
|
|
|
2240
2274
|
return this.width === size.width && this.height === size.height && (!size.pixelRatio || this.pixelRatio === size.pixelRatio);
|
|
2241
2275
|
}
|
|
2242
2276
|
getSameCanvas(useSameWorldTransform, useSameSmooth) {
|
|
2243
|
-
const canvas = this.manager ? this.manager.get(
|
|
2277
|
+
const { size, pixelSnap } = this, canvas = this.manager ? this.manager.get(size) : Creator.canvas(Object.assign({}, size));
|
|
2244
2278
|
canvas.save();
|
|
2245
2279
|
if (useSameWorldTransform)
|
|
2246
2280
|
copy$9(canvas.worldTransform, this.worldTransform), canvas.useWorldTransform();
|
|
2247
2281
|
if (useSameSmooth)
|
|
2248
2282
|
canvas.smooth = this.smooth;
|
|
2283
|
+
canvas.pixelSnap !== pixelSnap && (canvas.pixelSnap = pixelSnap);
|
|
2249
2284
|
return canvas;
|
|
2250
2285
|
}
|
|
2251
2286
|
recycle(clearBounds) {
|
|
@@ -3672,7 +3707,7 @@ var LeaferUI = (function (exports) {
|
|
|
3672
3707
|
const R = Resource;
|
|
3673
3708
|
|
|
3674
3709
|
const ImageManager = {
|
|
3675
|
-
maxRecycled:
|
|
3710
|
+
maxRecycled: 10,
|
|
3676
3711
|
recycledList: [],
|
|
3677
3712
|
patternTasker: new TaskProcessor(),
|
|
3678
3713
|
get(config) {
|
|
@@ -4025,9 +4060,8 @@ var LeaferUI = (function (exports) {
|
|
|
4025
4060
|
set(value) {
|
|
4026
4061
|
if (this.__setAttr(key, value)) {
|
|
4027
4062
|
this.__layout.hitCanvasChanged = true;
|
|
4028
|
-
if (Debug.
|
|
4063
|
+
if (Debug.showBounds === 'hit')
|
|
4029
4064
|
this.__layout.surfaceChanged || this.__layout.surfaceChange();
|
|
4030
|
-
}
|
|
4031
4065
|
if (this.leafer)
|
|
4032
4066
|
this.leafer.updateCursor();
|
|
4033
4067
|
}
|
|
@@ -4188,7 +4222,7 @@ var LeaferUI = (function (exports) {
|
|
|
4188
4222
|
}
|
|
4189
4223
|
|
|
4190
4224
|
const { copy: copy$7, toInnerPoint: toInnerPoint$1, toOuterPoint: toOuterPoint$1, scaleOfOuter: scaleOfOuter$2, rotateOfOuter: rotateOfOuter$2, skewOfOuter, multiplyParent: multiplyParent$2, divideParent, getLayout } = MatrixHelper;
|
|
4191
|
-
const matrix$1 = {};
|
|
4225
|
+
const matrix$1 = {}, { round } = Math;
|
|
4192
4226
|
const LeafHelper = {
|
|
4193
4227
|
updateAllMatrix(leaf, checkAutoLayout, waitAutoLayout) {
|
|
4194
4228
|
if (checkAutoLayout && leaf.__hasAutoLayout && leaf.__layout.matrixChanged)
|
|
@@ -4262,6 +4296,8 @@ var LeaferUI = (function (exports) {
|
|
|
4262
4296
|
y = x.y, x = x.x;
|
|
4263
4297
|
x += t.x;
|
|
4264
4298
|
y += t.y;
|
|
4299
|
+
if (t.leafer && t.leafer.config.pointSnap)
|
|
4300
|
+
x = round(x), y = round(y);
|
|
4265
4301
|
transition ? t.animate({ x, y }, transition) : (t.x = x, t.y = y);
|
|
4266
4302
|
},
|
|
4267
4303
|
zoomOfWorld(t, origin, scaleX, scaleY, resize, transition) {
|
|
@@ -4500,6 +4536,7 @@ var LeaferUI = (function (exports) {
|
|
|
4500
4536
|
set contentBounds(bounds) { this._contentBounds = bounds; }
|
|
4501
4537
|
get strokeBounds() { return this._strokeBounds || this.boxBounds; }
|
|
4502
4538
|
get renderBounds() { return this._renderBounds || this.boxBounds; }
|
|
4539
|
+
set renderBounds(bounds) { this._renderBounds = bounds; }
|
|
4503
4540
|
get localContentBounds() { toOuterOf$2(this.contentBounds, this.leaf.__localMatrix, this[localContent] || (this[localContent] = {})); return this[localContent]; }
|
|
4504
4541
|
get localStrokeBounds() { return this._localStrokeBounds || this; }
|
|
4505
4542
|
get localRenderBounds() { return this._localRenderBounds || this; }
|
|
@@ -4518,11 +4555,13 @@ var LeaferUI = (function (exports) {
|
|
|
4518
4555
|
get height() { return this.boxBounds.height; }
|
|
4519
4556
|
constructor(leaf) {
|
|
4520
4557
|
this.leaf = leaf;
|
|
4521
|
-
this.boxBounds = { x: 0, y: 0, width: 0, height: 0 };
|
|
4522
4558
|
if (this.leaf.__local)
|
|
4523
4559
|
this._localRenderBounds = this._localStrokeBounds = this.leaf.__local;
|
|
4524
|
-
|
|
4525
|
-
|
|
4560
|
+
if (leaf.__world) {
|
|
4561
|
+
this.boxBounds = { x: 0, y: 0, width: 0, height: 0 };
|
|
4562
|
+
this.boxChange();
|
|
4563
|
+
this.matrixChange();
|
|
4564
|
+
}
|
|
4526
4565
|
}
|
|
4527
4566
|
createLocal() {
|
|
4528
4567
|
const local = this.leaf.__local = { a: 1, b: 0, c: 0, d: 1, e: 0, f: 0, x: 0, y: 0, width: 0, height: 0 };
|
|
@@ -4854,6 +4893,9 @@ var LeaferUI = (function (exports) {
|
|
|
4854
4893
|
}
|
|
4855
4894
|
this.old = oldSize;
|
|
4856
4895
|
}
|
|
4896
|
+
static isResizing(leaf) {
|
|
4897
|
+
return this.resizingKeys && this.resizingKeys[leaf.innerId] !== undefined;
|
|
4898
|
+
}
|
|
4857
4899
|
}
|
|
4858
4900
|
ResizeEvent.RESIZE = 'resize';
|
|
4859
4901
|
|
|
@@ -4896,6 +4938,7 @@ var LeaferUI = (function (exports) {
|
|
|
4896
4938
|
}
|
|
4897
4939
|
RenderEvent.REQUEST = 'render.request';
|
|
4898
4940
|
RenderEvent.CHILD_START = 'render.child_start';
|
|
4941
|
+
RenderEvent.CHILD_END = 'render.child_end';
|
|
4899
4942
|
RenderEvent.START = 'render.start';
|
|
4900
4943
|
RenderEvent.BEFORE = 'render.before';
|
|
4901
4944
|
RenderEvent.RENDER = 'render';
|
|
@@ -5275,24 +5318,27 @@ var LeaferUI = (function (exports) {
|
|
|
5275
5318
|
const LeafRender = {
|
|
5276
5319
|
__render(canvas, options) {
|
|
5277
5320
|
if (this.__worldOpacity) {
|
|
5321
|
+
const data = this.__;
|
|
5278
5322
|
canvas.setWorld(this.__nowWorld = this.__getNowWorld(options));
|
|
5279
|
-
canvas.opacity =
|
|
5323
|
+
canvas.opacity = options.dimOpacity && !data.dimskip ? data.opacity * options.dimOpacity : data.opacity;
|
|
5280
5324
|
if (this.__.__single) {
|
|
5281
|
-
if (
|
|
5325
|
+
if (data.eraser === 'path')
|
|
5282
5326
|
return this.__renderEraser(canvas, options);
|
|
5283
5327
|
const tempCanvas = canvas.getSameCanvas(true, true);
|
|
5284
5328
|
this.__draw(tempCanvas, options, canvas);
|
|
5285
5329
|
if (this.__worldFlipped) {
|
|
5286
|
-
canvas.copyWorldByReset(tempCanvas, this.__nowWorld, null,
|
|
5330
|
+
canvas.copyWorldByReset(tempCanvas, this.__nowWorld, null, data.__blendMode, true);
|
|
5287
5331
|
}
|
|
5288
5332
|
else {
|
|
5289
|
-
canvas.copyWorldToInner(tempCanvas, this.__nowWorld, this.__layout.renderBounds,
|
|
5333
|
+
canvas.copyWorldToInner(tempCanvas, this.__nowWorld, this.__layout.renderBounds, data.__blendMode);
|
|
5290
5334
|
}
|
|
5291
5335
|
tempCanvas.recycle(this.__nowWorld);
|
|
5292
5336
|
}
|
|
5293
5337
|
else {
|
|
5294
5338
|
this.__draw(canvas, options);
|
|
5295
5339
|
}
|
|
5340
|
+
if (Debug.showBounds)
|
|
5341
|
+
Debug.drawBounds(this, canvas, options);
|
|
5296
5342
|
}
|
|
5297
5343
|
},
|
|
5298
5344
|
__clip(canvas, options) {
|
|
@@ -5322,14 +5368,19 @@ var LeaferUI = (function (exports) {
|
|
|
5322
5368
|
__render(canvas, options) {
|
|
5323
5369
|
this.__nowWorld = this.__getNowWorld(options);
|
|
5324
5370
|
if (this.__worldOpacity) {
|
|
5325
|
-
|
|
5326
|
-
|
|
5371
|
+
const data = this.__;
|
|
5372
|
+
if (data.dim)
|
|
5373
|
+
options.dimOpacity = data.dim === true ? 0.2 : data.dim;
|
|
5374
|
+
else if (data.dimskip)
|
|
5375
|
+
options.dimOpacity && (options.dimOpacity = 0);
|
|
5376
|
+
if (data.__single) {
|
|
5377
|
+
if (data.eraser === 'path')
|
|
5327
5378
|
return this.__renderEraser(canvas, options);
|
|
5328
5379
|
const tempCanvas = canvas.getSameCanvas(false, true);
|
|
5329
5380
|
this.__renderBranch(tempCanvas, options);
|
|
5330
5381
|
const nowWorld = this.__nowWorld;
|
|
5331
|
-
canvas.opacity =
|
|
5332
|
-
canvas.copyWorldByReset(tempCanvas, nowWorld, nowWorld,
|
|
5382
|
+
canvas.opacity = options.dimOpacity ? data.opacity * options.dimOpacity : data.opacity;
|
|
5383
|
+
canvas.copyWorldByReset(tempCanvas, nowWorld, nowWorld, data.__blendMode, true);
|
|
5333
5384
|
tempCanvas.recycle(nowWorld);
|
|
5334
5385
|
}
|
|
5335
5386
|
else {
|
|
@@ -5404,9 +5455,11 @@ var LeaferUI = (function (exports) {
|
|
|
5404
5455
|
reset(data) {
|
|
5405
5456
|
if (this.leafer)
|
|
5406
5457
|
this.leafer.forceRender(this.__world);
|
|
5407
|
-
|
|
5408
|
-
|
|
5409
|
-
|
|
5458
|
+
if (data !== 0) {
|
|
5459
|
+
this.__world = { a: 1, b: 0, c: 0, d: 1, e: 0, f: 0, x: 0, y: 0, width: 0, height: 0, scaleX: 1, scaleY: 1 };
|
|
5460
|
+
if (data !== null)
|
|
5461
|
+
this.__local = { a: 1, b: 0, c: 0, d: 1, e: 0, f: 0, x: 0, y: 0, width: 0, height: 0 };
|
|
5462
|
+
}
|
|
5410
5463
|
this.__worldOpacity = 1;
|
|
5411
5464
|
this.__ = new this.__DataProcessor(this);
|
|
5412
5465
|
this.__layout = new this.__LayoutProcessor(this);
|
|
@@ -5542,9 +5595,10 @@ var LeaferUI = (function (exports) {
|
|
|
5542
5595
|
if (options.matrix) {
|
|
5543
5596
|
if (!this.__cameraWorld)
|
|
5544
5597
|
this.__cameraWorld = {};
|
|
5545
|
-
const cameraWorld = this.__cameraWorld;
|
|
5546
|
-
multiplyParent(
|
|
5598
|
+
const cameraWorld = this.__cameraWorld, world = this.__world;
|
|
5599
|
+
multiplyParent(world, options.matrix, cameraWorld, undefined, world);
|
|
5547
5600
|
toOuterOf(this.__layout.renderBounds, cameraWorld, cameraWorld);
|
|
5601
|
+
cameraWorld.half !== world.half && (cameraWorld.half = world.half);
|
|
5548
5602
|
return cameraWorld;
|
|
5549
5603
|
}
|
|
5550
5604
|
else {
|
|
@@ -5704,7 +5758,7 @@ var LeaferUI = (function (exports) {
|
|
|
5704
5758
|
__updateHitCanvas() { }
|
|
5705
5759
|
__render(_canvas, _options) { }
|
|
5706
5760
|
__drawFast(_canvas, _options) { }
|
|
5707
|
-
__draw(_canvas, _options) { }
|
|
5761
|
+
__draw(_canvas, _options, _originCanvas) { }
|
|
5708
5762
|
__clip(_canvas, _options) { }
|
|
5709
5763
|
__renderShape(_canvas, _options, _ignoreFill, _ignoreStroke) { }
|
|
5710
5764
|
__updateWorldOpacity() { }
|
|
@@ -6074,7 +6128,7 @@ var LeaferUI = (function (exports) {
|
|
|
6074
6128
|
}
|
|
6075
6129
|
}
|
|
6076
6130
|
|
|
6077
|
-
const version = "1.
|
|
6131
|
+
const version = "1.6.1";
|
|
6078
6132
|
|
|
6079
6133
|
class LeaferCanvas extends LeaferCanvasBase {
|
|
6080
6134
|
get allowBackgroundColor() { return true; }
|
|
@@ -6314,7 +6368,6 @@ var LeaferUI = (function (exports) {
|
|
|
6314
6368
|
}
|
|
6315
6369
|
|
|
6316
6370
|
const { worldBounds } = LeafBoundsHelper;
|
|
6317
|
-
const bigBounds = { x: 0, y: 0, width: 100000, height: 100000 };
|
|
6318
6371
|
class LayoutBlockData {
|
|
6319
6372
|
constructor(list) {
|
|
6320
6373
|
this.updatedBounds = new Bounds();
|
|
@@ -6328,13 +6381,7 @@ var LeaferUI = (function (exports) {
|
|
|
6328
6381
|
this.beforeBounds.setListWithFn(this.updatedList.list, worldBounds);
|
|
6329
6382
|
}
|
|
6330
6383
|
setAfter() {
|
|
6331
|
-
|
|
6332
|
-
if (list.some(leaf => leaf.noBounds)) {
|
|
6333
|
-
this.afterBounds.set(bigBounds);
|
|
6334
|
-
}
|
|
6335
|
-
else {
|
|
6336
|
-
this.afterBounds.setListWithFn(list, worldBounds);
|
|
6337
|
-
}
|
|
6384
|
+
this.afterBounds.setListWithFn(this.updatedList.list, worldBounds);
|
|
6338
6385
|
this.updatedBounds.setList([this.beforeBounds, this.afterBounds]);
|
|
6339
6386
|
}
|
|
6340
6387
|
merge(data) {
|
|
@@ -6536,6 +6583,22 @@ var LeaferUI = (function (exports) {
|
|
|
6536
6583
|
requestLayout() {
|
|
6537
6584
|
this.target.emit(LayoutEvent.REQUEST);
|
|
6538
6585
|
}
|
|
6586
|
+
checkRender() {
|
|
6587
|
+
if (this.running) {
|
|
6588
|
+
const { target } = this;
|
|
6589
|
+
if (target.isApp) {
|
|
6590
|
+
target.emit(RenderEvent.CHILD_START, target);
|
|
6591
|
+
target.children.forEach(leafer => {
|
|
6592
|
+
leafer.renderer.FPS = this.FPS;
|
|
6593
|
+
leafer.renderer.checkRender();
|
|
6594
|
+
});
|
|
6595
|
+
target.emit(RenderEvent.CHILD_END, target);
|
|
6596
|
+
}
|
|
6597
|
+
if (this.changed && this.canvas.view)
|
|
6598
|
+
this.render();
|
|
6599
|
+
this.target.emit(RenderEvent.NEXT);
|
|
6600
|
+
}
|
|
6601
|
+
}
|
|
6539
6602
|
render(callback) {
|
|
6540
6603
|
if (!(this.running && this.canvas.view))
|
|
6541
6604
|
return this.update();
|
|
@@ -6544,8 +6607,6 @@ var LeaferUI = (function (exports) {
|
|
|
6544
6607
|
this.totalBounds = new Bounds();
|
|
6545
6608
|
debug$3.log(target.innerName, '--->');
|
|
6546
6609
|
try {
|
|
6547
|
-
if (!target.isApp)
|
|
6548
|
-
target.app.emit(RenderEvent.CHILD_START, target);
|
|
6549
6610
|
this.emitRender(RenderEvent.START);
|
|
6550
6611
|
this.renderOnce(callback);
|
|
6551
6612
|
this.emitRender(RenderEvent.END, this.totalBounds);
|
|
@@ -6613,20 +6674,12 @@ var LeaferUI = (function (exports) {
|
|
|
6613
6674
|
}
|
|
6614
6675
|
clipRender(block) {
|
|
6615
6676
|
const t = Run.start('PartRender');
|
|
6616
|
-
const { canvas } = this;
|
|
6617
|
-
const bounds = block.getIntersect(canvas.bounds);
|
|
6618
|
-
const includes = block.includes(this.target.__world);
|
|
6619
|
-
const realBounds = new Bounds(bounds);
|
|
6677
|
+
const { canvas } = this, bounds = block.getIntersect(canvas.bounds), realBounds = new Bounds(bounds);
|
|
6620
6678
|
canvas.save();
|
|
6621
|
-
|
|
6622
|
-
|
|
6623
|
-
|
|
6624
|
-
|
|
6625
|
-
bounds.spread(10 + 1 / this.canvas.pixelRatio).ceil();
|
|
6626
|
-
canvas.clearWorld(bounds, true);
|
|
6627
|
-
canvas.clipWorld(bounds, true);
|
|
6628
|
-
}
|
|
6629
|
-
this.__render(bounds, includes, realBounds);
|
|
6679
|
+
bounds.spread(Renderer.clipSpread).ceil();
|
|
6680
|
+
canvas.clearWorld(bounds, true);
|
|
6681
|
+
canvas.clipWorld(bounds, true);
|
|
6682
|
+
this.__render(bounds, realBounds);
|
|
6630
6683
|
canvas.restore();
|
|
6631
6684
|
Run.end(t);
|
|
6632
6685
|
}
|
|
@@ -6635,28 +6688,22 @@ var LeaferUI = (function (exports) {
|
|
|
6635
6688
|
const { canvas } = this;
|
|
6636
6689
|
canvas.save();
|
|
6637
6690
|
canvas.clear();
|
|
6638
|
-
this.__render(canvas.bounds
|
|
6691
|
+
this.__render(canvas.bounds);
|
|
6639
6692
|
canvas.restore();
|
|
6640
6693
|
Run.end(t);
|
|
6641
6694
|
}
|
|
6642
|
-
__render(bounds,
|
|
6643
|
-
const
|
|
6695
|
+
__render(bounds, realBounds) {
|
|
6696
|
+
const { canvas } = this, includes = bounds.includes(this.target.__world), options = includes ? { includes } : { bounds, includes };
|
|
6644
6697
|
if (this.needFill)
|
|
6645
|
-
|
|
6698
|
+
canvas.fillWorld(bounds, this.config.fill);
|
|
6646
6699
|
if (Debug.showRepaint)
|
|
6647
|
-
|
|
6648
|
-
this.target.__render(
|
|
6700
|
+
Debug.drawRepaint(canvas, bounds);
|
|
6701
|
+
this.target.__render(canvas, options);
|
|
6649
6702
|
this.renderBounds = realBounds = realBounds || bounds;
|
|
6650
6703
|
this.renderOptions = options;
|
|
6651
6704
|
this.totalBounds.isEmpty() ? this.totalBounds = realBounds : this.totalBounds.add(realBounds);
|
|
6652
|
-
|
|
6653
|
-
|
|
6654
|
-
if (Debug.showBoundsView)
|
|
6655
|
-
this.renderBoundsView(options);
|
|
6656
|
-
this.canvas.updateRender(realBounds);
|
|
6657
|
-
}
|
|
6658
|
-
renderHitView(_options) { }
|
|
6659
|
-
renderBoundsView(_options) { }
|
|
6705
|
+
canvas.updateRender(realBounds);
|
|
6706
|
+
}
|
|
6660
6707
|
addBlock(block) {
|
|
6661
6708
|
if (!this.updateBlocks)
|
|
6662
6709
|
this.updateBlocks = [];
|
|
@@ -6672,17 +6719,16 @@ var LeaferUI = (function (exports) {
|
|
|
6672
6719
|
}
|
|
6673
6720
|
}
|
|
6674
6721
|
__requestRender() {
|
|
6675
|
-
|
|
6722
|
+
const target = this.target;
|
|
6723
|
+
if (this.requestTime || !target)
|
|
6676
6724
|
return;
|
|
6725
|
+
if (target.parentApp)
|
|
6726
|
+
return target.parentApp.requestRender(false);
|
|
6677
6727
|
const requestTime = this.requestTime = Date.now();
|
|
6678
6728
|
Platform.requestRender(() => {
|
|
6679
6729
|
this.FPS = Math.min(60, Math.ceil(1000 / (Date.now() - requestTime)));
|
|
6680
6730
|
this.requestTime = 0;
|
|
6681
|
-
|
|
6682
|
-
if (this.changed && this.canvas.view)
|
|
6683
|
-
this.render();
|
|
6684
|
-
this.target.emit(RenderEvent.NEXT);
|
|
6685
|
-
}
|
|
6731
|
+
this.checkRender();
|
|
6686
6732
|
});
|
|
6687
6733
|
}
|
|
6688
6734
|
__onResize(e) {
|
|
@@ -6740,6 +6786,7 @@ var LeaferUI = (function (exports) {
|
|
|
6740
6786
|
}
|
|
6741
6787
|
}
|
|
6742
6788
|
}
|
|
6789
|
+
Renderer.clipSpread = 10;
|
|
6743
6790
|
|
|
6744
6791
|
const { hitRadiusPoint } = BoundsHelper;
|
|
6745
6792
|
class Picker {
|
|
@@ -6985,6 +7032,7 @@ var LeaferUI = (function (exports) {
|
|
|
6985
7032
|
return strokeWidth;
|
|
6986
7033
|
}
|
|
6987
7034
|
get __hasStroke() { return this.stroke && this.strokeWidth; }
|
|
7035
|
+
get __hasHalf() { const t = this; return (t.stroke && t.strokeAlign === 'center' && t.strokeWidth % 2) || undefined; }
|
|
6988
7036
|
get __hasMultiPaint() {
|
|
6989
7037
|
const t = this;
|
|
6990
7038
|
if ((t.__isFills && t.fill.length > 1) || (t.__isStrokes && t.stroke.length > 1) || t.__useEffect)
|
|
@@ -7029,14 +7077,14 @@ var LeaferUI = (function (exports) {
|
|
|
7029
7077
|
this.__removeInput('fill');
|
|
7030
7078
|
PaintImage.recycleImage('fill', this);
|
|
7031
7079
|
this.__isFills = false;
|
|
7032
|
-
|
|
7033
|
-
this.__pixelFill = false;
|
|
7080
|
+
this.__pixelFill && (this.__pixelFill = false);
|
|
7034
7081
|
}
|
|
7035
7082
|
this._fill = value;
|
|
7036
7083
|
}
|
|
7037
7084
|
else if (typeof value === 'object') {
|
|
7038
7085
|
this.__setInput('fill', value);
|
|
7039
|
-
|
|
7086
|
+
const layout = this.__leaf.__layout;
|
|
7087
|
+
layout.boxChanged || layout.boxChange();
|
|
7040
7088
|
this.__isFills = true;
|
|
7041
7089
|
this._fill || (this._fill = emptyPaint);
|
|
7042
7090
|
}
|
|
@@ -7047,14 +7095,14 @@ var LeaferUI = (function (exports) {
|
|
|
7047
7095
|
this.__removeInput('stroke');
|
|
7048
7096
|
PaintImage.recycleImage('stroke', this);
|
|
7049
7097
|
this.__isStrokes = false;
|
|
7050
|
-
|
|
7051
|
-
this.__pixelStroke = false;
|
|
7098
|
+
this.__pixelStroke && (this.__pixelStroke = false);
|
|
7052
7099
|
}
|
|
7053
7100
|
this._stroke = value;
|
|
7054
7101
|
}
|
|
7055
7102
|
else if (typeof value === 'object') {
|
|
7056
7103
|
this.__setInput('stroke', value);
|
|
7057
|
-
|
|
7104
|
+
const layout = this.__leaf.__layout;
|
|
7105
|
+
layout.boxChanged || layout.boxChange();
|
|
7058
7106
|
this.__isStrokes = true;
|
|
7059
7107
|
this._stroke || (this._stroke = emptyPaint);
|
|
7060
7108
|
}
|
|
@@ -7169,6 +7217,31 @@ var LeaferUI = (function (exports) {
|
|
|
7169
7217
|
this._fontWeight = value;
|
|
7170
7218
|
}
|
|
7171
7219
|
}
|
|
7220
|
+
setBoxStyle(value) {
|
|
7221
|
+
let t = this.__leaf, box = t.__box;
|
|
7222
|
+
if (value) {
|
|
7223
|
+
const { boxStyle } = this;
|
|
7224
|
+
if (box)
|
|
7225
|
+
for (let key in boxStyle)
|
|
7226
|
+
box[key] = undefined;
|
|
7227
|
+
else
|
|
7228
|
+
box = t.__box = UICreator.get('Rect', 0);
|
|
7229
|
+
const layout = t.__layout, boxLayout = box.__layout;
|
|
7230
|
+
if (!boxStyle)
|
|
7231
|
+
box.parent = t, box.__world = t.__world, boxLayout.boxBounds = layout.boxBounds;
|
|
7232
|
+
box.set(value);
|
|
7233
|
+
if (boxLayout.strokeChanged)
|
|
7234
|
+
layout.strokeChange();
|
|
7235
|
+
if (boxLayout.renderChanged)
|
|
7236
|
+
layout.renderChange();
|
|
7237
|
+
box.__updateChange();
|
|
7238
|
+
}
|
|
7239
|
+
else if (box) {
|
|
7240
|
+
t.__box = box.parent = null;
|
|
7241
|
+
box.destroy();
|
|
7242
|
+
}
|
|
7243
|
+
this._boxStyle = value;
|
|
7244
|
+
}
|
|
7172
7245
|
}
|
|
7173
7246
|
|
|
7174
7247
|
class ImageData extends RectData {
|
|
@@ -7206,7 +7279,7 @@ var LeaferUI = (function (exports) {
|
|
|
7206
7279
|
const UIBounds = {
|
|
7207
7280
|
__updateStrokeSpread() {
|
|
7208
7281
|
let width = 0, boxWidth = 0;
|
|
7209
|
-
const data = this.__, { strokeAlign, strokeWidth } = data;
|
|
7282
|
+
const data = this.__, { strokeAlign, strokeWidth } = data, box = this.__box;
|
|
7210
7283
|
if ((data.stroke || data.hitStroke === 'all') && strokeWidth && strokeAlign !== 'inside') {
|
|
7211
7284
|
boxWidth = width = strokeAlign === 'center' ? strokeWidth / 2 : strokeWidth;
|
|
7212
7285
|
if (!data.__boxStroke) {
|
|
@@ -7217,6 +7290,10 @@ var LeaferUI = (function (exports) {
|
|
|
7217
7290
|
}
|
|
7218
7291
|
if (data.__useArrow)
|
|
7219
7292
|
width += strokeWidth * 5;
|
|
7293
|
+
if (box) {
|
|
7294
|
+
width = Math.max(box.__layout.strokeSpread = box.__updateStrokeSpread(), width);
|
|
7295
|
+
boxWidth = box.__layout.strokeBoxSpread;
|
|
7296
|
+
}
|
|
7220
7297
|
this.__layout.strokeBoxSpread = boxWidth;
|
|
7221
7298
|
return width;
|
|
7222
7299
|
},
|
|
@@ -7235,25 +7312,26 @@ var LeaferUI = (function (exports) {
|
|
|
7235
7312
|
if (backgroundBlur)
|
|
7236
7313
|
shapeWidth = Math.max(shapeWidth, backgroundBlur);
|
|
7237
7314
|
this.__layout.renderShapeSpread = shapeWidth;
|
|
7238
|
-
|
|
7315
|
+
width += this.__layout.strokeSpread || 0;
|
|
7316
|
+
return this.__box ? Math.max(this.__box.__updateRenderSpread(), width) : width;
|
|
7239
7317
|
}
|
|
7240
7318
|
};
|
|
7241
7319
|
|
|
7242
7320
|
const UIRender = {
|
|
7243
7321
|
__updateChange() {
|
|
7244
|
-
const data = this.__;
|
|
7322
|
+
const data = this.__, w = this.__world;
|
|
7245
7323
|
if (data.__useEffect) {
|
|
7246
7324
|
const { shadow, innerShadow, blur, backgroundBlur, filter } = this.__;
|
|
7247
7325
|
data.__useEffect = !!(shadow || innerShadow || blur || backgroundBlur || filter);
|
|
7248
7326
|
}
|
|
7327
|
+
const half = data.__hasHalf;
|
|
7328
|
+
w.half !== half && (w.half = half);
|
|
7249
7329
|
data.__checkSingle();
|
|
7250
7330
|
const complex = data.__isFills || data.__isStrokes || data.cornerRadius || data.__useEffect;
|
|
7251
|
-
if (complex)
|
|
7331
|
+
if (complex)
|
|
7252
7332
|
data.__complex = true;
|
|
7253
|
-
|
|
7254
|
-
else {
|
|
7333
|
+
else
|
|
7255
7334
|
data.__complex && (data.__complex = false);
|
|
7256
|
-
}
|
|
7257
7335
|
},
|
|
7258
7336
|
__drawFast(canvas, options) {
|
|
7259
7337
|
drawFast(this, canvas, options);
|
|
@@ -7340,10 +7418,11 @@ var LeaferUI = (function (exports) {
|
|
|
7340
7418
|
|
|
7341
7419
|
const RectRender = {
|
|
7342
7420
|
__drawFast(canvas, options) {
|
|
7343
|
-
let {
|
|
7421
|
+
let { x, y, width, height } = this.__layout.boxBounds;
|
|
7422
|
+
const { fill, stroke, __drawAfterFill } = this.__;
|
|
7344
7423
|
if (fill) {
|
|
7345
7424
|
canvas.fillStyle = fill;
|
|
7346
|
-
canvas.fillRect(
|
|
7425
|
+
canvas.fillRect(x, y, width, height);
|
|
7347
7426
|
}
|
|
7348
7427
|
if (__drawAfterFill)
|
|
7349
7428
|
this.__drawAfterFill(canvas, options);
|
|
@@ -7362,14 +7441,14 @@ var LeaferUI = (function (exports) {
|
|
|
7362
7441
|
if (width < 0 || height < 0) {
|
|
7363
7442
|
canvas.save();
|
|
7364
7443
|
this.__clip(canvas, options);
|
|
7365
|
-
canvas.strokeRect(half, half, width, height);
|
|
7444
|
+
canvas.strokeRect(x + half, y + half, width, height);
|
|
7366
7445
|
canvas.restore();
|
|
7367
7446
|
}
|
|
7368
7447
|
else
|
|
7369
|
-
canvas.strokeRect(half, half, width, height);
|
|
7448
|
+
canvas.strokeRect(x + half, y + half, width, height);
|
|
7370
7449
|
break;
|
|
7371
7450
|
case 'outside':
|
|
7372
|
-
canvas.strokeRect(-half, -half, width + __strokeWidth, height + __strokeWidth);
|
|
7451
|
+
canvas.strokeRect(x - half, y - half, width + __strokeWidth, height + __strokeWidth);
|
|
7373
7452
|
break;
|
|
7374
7453
|
}
|
|
7375
7454
|
}
|
|
@@ -7525,6 +7604,12 @@ var LeaferUI = (function (exports) {
|
|
|
7525
7604
|
__decorate([
|
|
7526
7605
|
surfaceType(false)
|
|
7527
7606
|
], exports.UI.prototype, "locked", void 0);
|
|
7607
|
+
__decorate([
|
|
7608
|
+
surfaceType(false)
|
|
7609
|
+
], exports.UI.prototype, "dim", void 0);
|
|
7610
|
+
__decorate([
|
|
7611
|
+
surfaceType(false)
|
|
7612
|
+
], exports.UI.prototype, "dimskip", void 0);
|
|
7528
7613
|
__decorate([
|
|
7529
7614
|
sortType(0)
|
|
7530
7615
|
], exports.UI.prototype, "zIndex", void 0);
|
|
@@ -7786,7 +7871,7 @@ var LeaferUI = (function (exports) {
|
|
|
7786
7871
|
start: true,
|
|
7787
7872
|
hittable: true,
|
|
7788
7873
|
smooth: true,
|
|
7789
|
-
lazySpeard: 100
|
|
7874
|
+
lazySpeard: 100,
|
|
7790
7875
|
};
|
|
7791
7876
|
this.leafs = 0;
|
|
7792
7877
|
this.__eventIds = [];
|
|
@@ -8210,13 +8295,13 @@ var LeaferUI = (function (exports) {
|
|
|
8210
8295
|
super.__updateRenderBounds();
|
|
8211
8296
|
copy$3(childrenRenderBounds, renderBounds);
|
|
8212
8297
|
this.__updateRectRenderBounds();
|
|
8213
|
-
isOverflow = !includes$1(renderBounds, childrenRenderBounds);
|
|
8298
|
+
isOverflow = !includes$1(renderBounds, childrenRenderBounds) || undefined;
|
|
8214
8299
|
if (isOverflow && this.__.overflow !== 'hide')
|
|
8215
8300
|
add(renderBounds, childrenRenderBounds);
|
|
8216
8301
|
}
|
|
8217
8302
|
else
|
|
8218
8303
|
this.__updateRectRenderBounds();
|
|
8219
|
-
|
|
8304
|
+
this.isOverflow !== isOverflow && (this.isOverflow = isOverflow);
|
|
8220
8305
|
}
|
|
8221
8306
|
__updateRectRenderBounds() { }
|
|
8222
8307
|
__updateRectChange() { }
|
|
@@ -8624,33 +8709,13 @@ var LeaferUI = (function (exports) {
|
|
|
8624
8709
|
registerUI()
|
|
8625
8710
|
], exports.Canvas);
|
|
8626
8711
|
|
|
8627
|
-
const { copyAndSpread, includes,
|
|
8712
|
+
const { copyAndSpread, includes, spread, setList } = BoundsHelper;
|
|
8628
8713
|
exports.Text = class Text extends exports.UI {
|
|
8629
8714
|
get __tag() { return 'Text'; }
|
|
8630
|
-
get textDrawData() {
|
|
8631
|
-
this.__layout.update();
|
|
8632
|
-
return this.__.__textDrawData;
|
|
8633
|
-
}
|
|
8715
|
+
get textDrawData() { this.updateLayout(); return this.__.__textDrawData; }
|
|
8634
8716
|
constructor(data) {
|
|
8635
8717
|
super(data);
|
|
8636
8718
|
}
|
|
8637
|
-
__drawHitPath(canvas) {
|
|
8638
|
-
const { __lineHeight, fontSize, __baseLine, __textDrawData: data } = this.__;
|
|
8639
|
-
canvas.beginPath();
|
|
8640
|
-
if (this.__.__letterSpacing < 0) {
|
|
8641
|
-
this.__drawPathByData(canvas);
|
|
8642
|
-
}
|
|
8643
|
-
else {
|
|
8644
|
-
data.rows.forEach(row => canvas.rect(row.x, row.y - __baseLine, row.width, __lineHeight < fontSize ? fontSize : __lineHeight));
|
|
8645
|
-
}
|
|
8646
|
-
}
|
|
8647
|
-
__drawPathByData(drawer, _data) {
|
|
8648
|
-
const { x, y, width, height } = this.__layout.boxBounds;
|
|
8649
|
-
drawer.rect(x, y, width, height);
|
|
8650
|
-
}
|
|
8651
|
-
__drawRenderPath(canvas) {
|
|
8652
|
-
canvas.font = this.__.__font;
|
|
8653
|
-
}
|
|
8654
8719
|
__updateTextDrawData() {
|
|
8655
8720
|
const data = this.__;
|
|
8656
8721
|
const { lineHeight, letterSpacing, fontFamily, fontSize, fontWeight, italic, textCase, textOverflow, padding } = data;
|
|
@@ -8667,15 +8732,16 @@ var LeaferUI = (function (exports) {
|
|
|
8667
8732
|
const layout = this.__layout;
|
|
8668
8733
|
const { fontSize, italic, padding, __autoWidth: autoWidth, __autoHeight: autoHeight } = data;
|
|
8669
8734
|
this.__updateTextDrawData();
|
|
8670
|
-
const { bounds } = data.__textDrawData;
|
|
8735
|
+
const { bounds: contentBounds } = data.__textDrawData;
|
|
8671
8736
|
const b = layout.boxBounds;
|
|
8737
|
+
layout.contentBounds = contentBounds;
|
|
8672
8738
|
if (data.__lineHeight < fontSize)
|
|
8673
|
-
spread(
|
|
8739
|
+
spread(contentBounds, fontSize / 2);
|
|
8674
8740
|
if (autoWidth || autoHeight) {
|
|
8675
|
-
b.x = autoWidth ?
|
|
8676
|
-
b.y = autoHeight ?
|
|
8677
|
-
b.width = autoWidth ?
|
|
8678
|
-
b.height = autoHeight ?
|
|
8741
|
+
b.x = autoWidth ? contentBounds.x : 0;
|
|
8742
|
+
b.y = autoHeight ? contentBounds.y : 0;
|
|
8743
|
+
b.width = autoWidth ? contentBounds.width : data.width;
|
|
8744
|
+
b.height = autoHeight ? contentBounds.height : data.height;
|
|
8679
8745
|
if (padding) {
|
|
8680
8746
|
const [top, right, bottom, left] = data.__padding;
|
|
8681
8747
|
if (autoWidth)
|
|
@@ -8689,23 +8755,45 @@ var LeaferUI = (function (exports) {
|
|
|
8689
8755
|
super.__updateBoxBounds();
|
|
8690
8756
|
if (italic)
|
|
8691
8757
|
b.width += fontSize * 0.16;
|
|
8692
|
-
const
|
|
8693
|
-
if (
|
|
8694
|
-
|
|
8695
|
-
layout.renderChanged = true;
|
|
8696
|
-
setList(data.__textBoxBounds = {}, [b, bounds]);
|
|
8697
|
-
}
|
|
8758
|
+
const isOverflow = !includes(b, contentBounds) || undefined;
|
|
8759
|
+
if (isOverflow)
|
|
8760
|
+
setList(data.__textBoxBounds = {}, [b, contentBounds]), layout.renderChanged = true;
|
|
8698
8761
|
else
|
|
8699
|
-
data.__textBoxBounds =
|
|
8762
|
+
data.__textBoxBounds = b;
|
|
8763
|
+
this.isOverflow !== isOverflow && (this.isOverflow = isOverflow);
|
|
8764
|
+
}
|
|
8765
|
+
__onUpdateSize() {
|
|
8766
|
+
if (this.__box)
|
|
8767
|
+
this.__box.__onUpdateSize();
|
|
8768
|
+
super.__onUpdateSize();
|
|
8700
8769
|
}
|
|
8701
8770
|
__updateRenderSpread() {
|
|
8702
8771
|
let width = super.__updateRenderSpread();
|
|
8703
8772
|
if (!width)
|
|
8704
|
-
width = this.
|
|
8773
|
+
width = this.isOverflow ? 1 : 0;
|
|
8705
8774
|
return width;
|
|
8706
8775
|
}
|
|
8707
8776
|
__updateRenderBounds() {
|
|
8708
|
-
|
|
8777
|
+
const { renderBounds, renderSpread } = this.__layout;
|
|
8778
|
+
copyAndSpread(renderBounds, this.__.__textBoxBounds, renderSpread);
|
|
8779
|
+
if (this.__box)
|
|
8780
|
+
this.__box.__layout.renderBounds = renderBounds;
|
|
8781
|
+
}
|
|
8782
|
+
__drawRenderPath(canvas) {
|
|
8783
|
+
canvas.font = this.__.__font;
|
|
8784
|
+
}
|
|
8785
|
+
__draw(canvas, options, originCanvas) {
|
|
8786
|
+
const box = this.__box;
|
|
8787
|
+
if (box)
|
|
8788
|
+
box.__nowWorld = this.__nowWorld, box.__draw(canvas, options, originCanvas);
|
|
8789
|
+
if (this.textEditing && !Export.running)
|
|
8790
|
+
return;
|
|
8791
|
+
super.__draw(canvas, options, originCanvas);
|
|
8792
|
+
}
|
|
8793
|
+
destroy() {
|
|
8794
|
+
if (this.boxStyle)
|
|
8795
|
+
this.boxStyle = null;
|
|
8796
|
+
super.destroy();
|
|
8709
8797
|
}
|
|
8710
8798
|
};
|
|
8711
8799
|
__decorate([
|
|
@@ -8717,6 +8805,9 @@ var LeaferUI = (function (exports) {
|
|
|
8717
8805
|
__decorate([
|
|
8718
8806
|
boundsType(0)
|
|
8719
8807
|
], exports.Text.prototype, "height", void 0);
|
|
8808
|
+
__decorate([
|
|
8809
|
+
surfaceType()
|
|
8810
|
+
], exports.Text.prototype, "boxStyle", void 0);
|
|
8720
8811
|
__decorate([
|
|
8721
8812
|
dataType(false)
|
|
8722
8813
|
], exports.Text.prototype, "resizeFontSize", void 0);
|
|
@@ -8880,26 +8971,25 @@ var LeaferUI = (function (exports) {
|
|
|
8880
8971
|
this.leafer = this;
|
|
8881
8972
|
this.watcher.disable();
|
|
8882
8973
|
this.layouter.disable();
|
|
8883
|
-
this.__eventIds.push(this.on_(PropertyEvent.CHANGE, this.__onPropertyChange, this));
|
|
8884
8974
|
}
|
|
8885
8975
|
start() {
|
|
8886
8976
|
super.start();
|
|
8887
|
-
this.
|
|
8977
|
+
this.forEach(leafer => leafer.start());
|
|
8888
8978
|
}
|
|
8889
8979
|
stop() {
|
|
8890
|
-
this.
|
|
8980
|
+
this.forEach(leafer => leafer.stop());
|
|
8891
8981
|
super.stop();
|
|
8892
8982
|
}
|
|
8893
8983
|
unlockLayout() {
|
|
8894
8984
|
super.unlockLayout();
|
|
8895
|
-
this.
|
|
8985
|
+
this.forEach(leafer => leafer.unlockLayout());
|
|
8896
8986
|
}
|
|
8897
8987
|
lockLayout() {
|
|
8898
8988
|
super.lockLayout();
|
|
8899
|
-
this.
|
|
8989
|
+
this.forEach(leafer => leafer.lockLayout());
|
|
8900
8990
|
}
|
|
8901
8991
|
forceRender(bounds, sync) {
|
|
8902
|
-
this.
|
|
8992
|
+
this.forEach(leafer => leafer.forceRender(bounds, sync));
|
|
8903
8993
|
}
|
|
8904
8994
|
addLeafer(merge) {
|
|
8905
8995
|
const leafer = new exports.Leafer(merge);
|
|
@@ -8919,9 +9009,8 @@ var LeaferUI = (function (exports) {
|
|
|
8919
9009
|
leafer.canvas.childIndex = index;
|
|
8920
9010
|
this.__listenChildEvents(leafer);
|
|
8921
9011
|
}
|
|
8922
|
-
|
|
8923
|
-
|
|
8924
|
-
this.children.forEach(leafer => leafer.forceUpdate('surface'));
|
|
9012
|
+
forEach(fn) {
|
|
9013
|
+
this.children.forEach(fn);
|
|
8925
9014
|
}
|
|
8926
9015
|
__onCreated() {
|
|
8927
9016
|
this.created = this.children.every(child => child.created);
|
|
@@ -8944,18 +9033,18 @@ var LeaferUI = (function (exports) {
|
|
|
8944
9033
|
const m = options.matrix;
|
|
8945
9034
|
if (m)
|
|
8946
9035
|
canvas.setTransform(m.a, m.b, m.c, m.d, m.e, m.f);
|
|
8947
|
-
this.
|
|
9036
|
+
this.forEach(leafer => canvas.copyWorld(leafer.canvas));
|
|
8948
9037
|
}
|
|
8949
9038
|
}
|
|
8950
9039
|
__onResize(event) {
|
|
8951
|
-
this.
|
|
9040
|
+
this.forEach(leafer => leafer.resize(event));
|
|
8952
9041
|
super.__onResize(event);
|
|
8953
9042
|
}
|
|
8954
9043
|
updateLayout() {
|
|
8955
|
-
this.
|
|
9044
|
+
this.forEach(leafer => leafer.updateLayout());
|
|
8956
9045
|
}
|
|
8957
9046
|
__getChildConfig(userConfig) {
|
|
8958
|
-
|
|
9047
|
+
const config = Object.assign({}, this.config);
|
|
8959
9048
|
config.hittable = config.realCanvas = undefined;
|
|
8960
9049
|
if (userConfig)
|
|
8961
9050
|
DataHelper.assign(config, userConfig);
|
|
@@ -9514,6 +9603,7 @@ var LeaferUI = (function (exports) {
|
|
|
9514
9603
|
delta: { x: 80 / 4, y: 8.0 },
|
|
9515
9604
|
},
|
|
9516
9605
|
pointer: {
|
|
9606
|
+
snap: true,
|
|
9517
9607
|
hitRadius: 5,
|
|
9518
9608
|
tapTime: 120,
|
|
9519
9609
|
longPressTime: 800,
|
|
@@ -9608,8 +9698,7 @@ var LeaferUI = (function (exports) {
|
|
|
9608
9698
|
if (this.downData) {
|
|
9609
9699
|
const canDrag = PointHelper.getDistance(this.downData, data) > this.p.dragDistance;
|
|
9610
9700
|
if (canDrag) {
|
|
9611
|
-
|
|
9612
|
-
this.pointerWaitCancel();
|
|
9701
|
+
this.pointerWaitCancel();
|
|
9613
9702
|
this.waitRightTap = false;
|
|
9614
9703
|
}
|
|
9615
9704
|
this.dragger.checkDrag(data, canDrag);
|
|
@@ -9869,7 +9958,10 @@ var LeaferUI = (function (exports) {
|
|
|
9869
9958
|
}
|
|
9870
9959
|
getLocal(clientPoint, updateClient) {
|
|
9871
9960
|
const clientBounds = this.canvas.getClientBounds(updateClient);
|
|
9872
|
-
|
|
9961
|
+
const point = { x: clientPoint.clientX - clientBounds.x, y: clientPoint.clientY - clientBounds.y };
|
|
9962
|
+
if (this.p.snap)
|
|
9963
|
+
PointHelper.round(point);
|
|
9964
|
+
return point;
|
|
9873
9965
|
}
|
|
9874
9966
|
emitTap(data) {
|
|
9875
9967
|
this.emit(exports.PointerEvent.TAP, data);
|
|
@@ -9888,9 +9980,11 @@ var LeaferUI = (function (exports) {
|
|
|
9888
9980
|
this.waitTap = true;
|
|
9889
9981
|
}
|
|
9890
9982
|
tapWaitCancel() {
|
|
9891
|
-
|
|
9892
|
-
|
|
9893
|
-
|
|
9983
|
+
if (this.waitTap) {
|
|
9984
|
+
clearTimeout(this.tapTimer);
|
|
9985
|
+
this.waitTap = false;
|
|
9986
|
+
this.tapCount = 0;
|
|
9987
|
+
}
|
|
9894
9988
|
}
|
|
9895
9989
|
longPressWait(data) {
|
|
9896
9990
|
clearTimeout(this.longPressTimer);
|
|
@@ -9910,8 +10004,10 @@ var LeaferUI = (function (exports) {
|
|
|
9910
10004
|
return hasLong;
|
|
9911
10005
|
}
|
|
9912
10006
|
longPressWaitCancel() {
|
|
9913
|
-
|
|
9914
|
-
|
|
10007
|
+
if (this.longPressTimer) {
|
|
10008
|
+
clearTimeout(this.longPressTimer);
|
|
10009
|
+
this.longPressed = false;
|
|
10010
|
+
}
|
|
9915
10011
|
}
|
|
9916
10012
|
__onResize() {
|
|
9917
10013
|
const { dragOut } = this.m;
|
|
@@ -10001,25 +10097,26 @@ var LeaferUI = (function (exports) {
|
|
|
10001
10097
|
const inner = {};
|
|
10002
10098
|
const leaf = exports.Leaf.prototype;
|
|
10003
10099
|
leaf.__hitWorld = function (point) {
|
|
10004
|
-
|
|
10100
|
+
const data = this.__;
|
|
10101
|
+
if (!data.hitSelf)
|
|
10005
10102
|
return false;
|
|
10006
|
-
|
|
10103
|
+
const world = this.__world, layout = this.__layout;
|
|
10104
|
+
const isSmall = world.width < 10 && world.height < 10;
|
|
10105
|
+
if (data.hitRadius) {
|
|
10007
10106
|
copy$2(inner, point), point = inner;
|
|
10008
|
-
setRadius(point,
|
|
10107
|
+
setRadius(point, data.hitRadius);
|
|
10009
10108
|
}
|
|
10010
|
-
toInnerRadiusPointOf(point,
|
|
10011
|
-
|
|
10012
|
-
|
|
10013
|
-
if (this.__.hitBox || isSmall) {
|
|
10014
|
-
if (BoundsHelper.hitRadiusPoint(this.__layout.boxBounds, inner))
|
|
10109
|
+
toInnerRadiusPointOf(point, world, inner);
|
|
10110
|
+
if (data.hitBox || isSmall) {
|
|
10111
|
+
if (BoundsHelper.hitRadiusPoint(layout.boxBounds, inner))
|
|
10015
10112
|
return true;
|
|
10016
10113
|
if (isSmall)
|
|
10017
10114
|
return false;
|
|
10018
10115
|
}
|
|
10019
|
-
if (
|
|
10116
|
+
if (layout.hitCanvasChanged || !this.__hitCanvas) {
|
|
10020
10117
|
this.__updateHitCanvas();
|
|
10021
|
-
if (!
|
|
10022
|
-
|
|
10118
|
+
if (!layout.boundsChanged)
|
|
10119
|
+
layout.hitCanvasChanged = false;
|
|
10023
10120
|
}
|
|
10024
10121
|
return this.__hit(inner);
|
|
10025
10122
|
};
|
|
@@ -10032,7 +10129,9 @@ var LeaferUI = (function (exports) {
|
|
|
10032
10129
|
const matrix = new Matrix();
|
|
10033
10130
|
const ui$1 = exports.UI.prototype;
|
|
10034
10131
|
ui$1.__updateHitCanvas = function () {
|
|
10035
|
-
|
|
10132
|
+
if (this.__box)
|
|
10133
|
+
this.__box.__updateHitCanvas();
|
|
10134
|
+
const data = this.__, { hitCanvasManager } = this.leafer || this.parent.leafer;
|
|
10036
10135
|
const isHitPixelFill = (data.__pixelFill || data.__isCanvas) && data.hitFill === 'pixel';
|
|
10037
10136
|
const isHitPixelStroke = data.__pixelStroke && data.hitStroke === 'pixel';
|
|
10038
10137
|
const isHitPixel = isHitPixelFill || isHitPixelStroke;
|
|
@@ -10059,6 +10158,8 @@ var LeaferUI = (function (exports) {
|
|
|
10059
10158
|
h.setStrokeOptions(data);
|
|
10060
10159
|
};
|
|
10061
10160
|
ui$1.__hit = function (inner) {
|
|
10161
|
+
if (this.__box && this.__box.__hit(inner))
|
|
10162
|
+
return true;
|
|
10062
10163
|
const data = this.__;
|
|
10063
10164
|
if (data.__isHitPixel && this.__hitPixel(inner))
|
|
10064
10165
|
return true;
|
|
@@ -10107,6 +10208,15 @@ var LeaferUI = (function (exports) {
|
|
|
10107
10208
|
return this.__hitCanvas ? ui.__hitFill.call(this, inner) : BoundsHelper.hitRadiusPoint(this.__layout.boxBounds, inner);
|
|
10108
10209
|
};
|
|
10109
10210
|
|
|
10211
|
+
exports.Text.prototype.__drawHitPath = function (canvas) {
|
|
10212
|
+
const { __lineHeight, fontSize, __baseLine, __letterSpacing, __textDrawData: data } = this.__;
|
|
10213
|
+
canvas.beginPath();
|
|
10214
|
+
if (__letterSpacing < 0)
|
|
10215
|
+
this.__drawPathByBox(canvas);
|
|
10216
|
+
else
|
|
10217
|
+
data.rows.forEach(row => canvas.rect(row.x, row.y - __baseLine, row.width, __lineHeight < fontSize ? fontSize : __lineHeight));
|
|
10218
|
+
};
|
|
10219
|
+
|
|
10110
10220
|
function getSelector(ui) {
|
|
10111
10221
|
return ui.leafer ? ui.leafer.selector : (Platform.selector || (Platform.selector = Creator.selector()));
|
|
10112
10222
|
}
|
|
@@ -10489,9 +10599,11 @@ var LeaferUI = (function (exports) {
|
|
|
10489
10599
|
const tempPoint = {};
|
|
10490
10600
|
const tempScaleData = {};
|
|
10491
10601
|
function createData(leafPaint, image, paint, box) {
|
|
10492
|
-
const { blendMode, sync } = paint;
|
|
10602
|
+
const { blendMode, changeful, sync } = paint;
|
|
10493
10603
|
if (blendMode)
|
|
10494
10604
|
leafPaint.blendMode = blendMode;
|
|
10605
|
+
if (changeful)
|
|
10606
|
+
leafPaint.changeful = changeful;
|
|
10495
10607
|
if (sync)
|
|
10496
10608
|
leafPaint.sync = sync;
|
|
10497
10609
|
leafPaint.data = getPatternData(paint, box, image);
|
|
@@ -10724,40 +10836,32 @@ var LeaferUI = (function (exports) {
|
|
|
10724
10836
|
}
|
|
10725
10837
|
|
|
10726
10838
|
const { abs } = Math;
|
|
10727
|
-
function checkImage(ui, canvas, paint,
|
|
10839
|
+
function checkImage(ui, canvas, paint, allowDraw) {
|
|
10728
10840
|
const { scaleX, scaleY } = ImageManager.patternLocked ? ui.__world : ui.__nowWorld;
|
|
10729
|
-
const { pixelRatio } = canvas;
|
|
10730
|
-
if (!
|
|
10841
|
+
const { pixelRatio } = canvas, { data } = paint;
|
|
10842
|
+
if (!data || (paint.patternId === scaleX + '-' + scaleY + '-' + pixelRatio && !Export.running)) {
|
|
10731
10843
|
return false;
|
|
10732
10844
|
}
|
|
10733
10845
|
else {
|
|
10734
|
-
|
|
10735
|
-
|
|
10736
|
-
|
|
10737
|
-
let { width, height } = data;
|
|
10738
|
-
width *= abs(scaleX) * pixelRatio;
|
|
10739
|
-
height *= abs(scaleY) * pixelRatio;
|
|
10740
|
-
if (data.scaleX) {
|
|
10741
|
-
width *= data.scaleX;
|
|
10742
|
-
height *= data.scaleY;
|
|
10743
|
-
}
|
|
10744
|
-
allowPaint = (width * height > Platform.image.maxCacheSize) || Export.running;
|
|
10846
|
+
if (allowDraw) {
|
|
10847
|
+
if (data.repeat) {
|
|
10848
|
+
allowDraw = false;
|
|
10745
10849
|
}
|
|
10746
10850
|
else {
|
|
10747
|
-
|
|
10851
|
+
if (!(paint.changeful || ResizeEvent.isResizing(ui) || Export.running)) {
|
|
10852
|
+
let { width, height } = data;
|
|
10853
|
+
width *= abs(scaleX) * pixelRatio;
|
|
10854
|
+
height *= abs(scaleY) * pixelRatio;
|
|
10855
|
+
if (data.scaleX) {
|
|
10856
|
+
width *= data.scaleX;
|
|
10857
|
+
height *= data.scaleY;
|
|
10858
|
+
}
|
|
10859
|
+
allowDraw = (width * height > Platform.image.maxCacheSize);
|
|
10860
|
+
}
|
|
10748
10861
|
}
|
|
10749
10862
|
}
|
|
10750
|
-
if (
|
|
10751
|
-
canvas
|
|
10752
|
-
ui.windingRule ? canvas.clip(ui.windingRule) : canvas.clip();
|
|
10753
|
-
if (paint.blendMode)
|
|
10754
|
-
canvas.blendMode = paint.blendMode;
|
|
10755
|
-
if (data.opacity)
|
|
10756
|
-
canvas.opacity *= data.opacity;
|
|
10757
|
-
if (data.transform)
|
|
10758
|
-
canvas.transform(data.transform);
|
|
10759
|
-
canvas.drawImage(paint.image.getFull(data.filters), 0, 0, data.width, data.height);
|
|
10760
|
-
canvas.restore();
|
|
10863
|
+
if (allowDraw) {
|
|
10864
|
+
drawImage(ui, canvas, paint, data);
|
|
10761
10865
|
return true;
|
|
10762
10866
|
}
|
|
10763
10867
|
else {
|
|
@@ -10778,13 +10882,26 @@ var LeaferUI = (function (exports) {
|
|
|
10778
10882
|
}
|
|
10779
10883
|
}
|
|
10780
10884
|
}
|
|
10885
|
+
function drawImage(ui, canvas, paint, data) {
|
|
10886
|
+
canvas.save();
|
|
10887
|
+
ui.windingRule ? canvas.clip(ui.windingRule) : canvas.clip();
|
|
10888
|
+
if (paint.blendMode)
|
|
10889
|
+
canvas.blendMode = paint.blendMode;
|
|
10890
|
+
if (data.opacity)
|
|
10891
|
+
canvas.opacity *= data.opacity;
|
|
10892
|
+
if (data.transform)
|
|
10893
|
+
canvas.transform(data.transform);
|
|
10894
|
+
canvas.drawImage(paint.image.getFull(data.filters), 0, 0, data.width, data.height);
|
|
10895
|
+
canvas.restore();
|
|
10896
|
+
}
|
|
10781
10897
|
|
|
10782
10898
|
function recycleImage(attrName, data) {
|
|
10783
10899
|
const paints = data['_' + attrName];
|
|
10784
10900
|
if (paints instanceof Array) {
|
|
10785
|
-
let image, recycleMap, input, url;
|
|
10901
|
+
let paint, image, recycleMap, input, url;
|
|
10786
10902
|
for (let i = 0, len = paints.length; i < len; i++) {
|
|
10787
|
-
|
|
10903
|
+
paint = paints[i];
|
|
10904
|
+
image = paint.image;
|
|
10788
10905
|
url = image && image.url;
|
|
10789
10906
|
if (url) {
|
|
10790
10907
|
if (!recycleMap)
|
|
@@ -10799,8 +10916,6 @@ var LeaferUI = (function (exports) {
|
|
|
10799
10916
|
}
|
|
10800
10917
|
image.unload(paints[i].loadId, !input.some((item) => item.url === url));
|
|
10801
10918
|
}
|
|
10802
|
-
else
|
|
10803
|
-
paints[i].style = null;
|
|
10804
10919
|
}
|
|
10805
10920
|
}
|
|
10806
10921
|
return recycleMap;
|
|
@@ -10979,7 +11094,7 @@ var LeaferUI = (function (exports) {
|
|
|
10979
11094
|
const offsetOutBounds = {};
|
|
10980
11095
|
function innerShadow(ui, current, shape) {
|
|
10981
11096
|
let copyBounds, spreadScale;
|
|
10982
|
-
const { __nowWorld: nowWorld, __layout
|
|
11097
|
+
const { __nowWorld: nowWorld, __layout } = ui;
|
|
10983
11098
|
const { innerShadow } = ui.__;
|
|
10984
11099
|
const { worldCanvas, bounds, shapeBounds, scaleX, scaleY } = shape;
|
|
10985
11100
|
const other = current.getSameCanvas();
|