@leafer-ui/miniapp 2.0.1 → 2.0.3

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.
@@ -213,6 +213,7 @@ class LeafData {
213
213
  }
214
214
  destroy() {
215
215
  this.__input = this.__middle = null;
216
+ if (this.__complexData) this.__complexData.destroy();
216
217
  }
217
218
  }
218
219
 
@@ -311,6 +312,8 @@ const {set: set$2, get: get$5, setTemp: setTemp, toTempAB: toTempAB} = FourNumbe
311
312
 
312
313
  const {round: round$3, pow: pow$1, max: max$4, floor: floor$2, PI: PI$3} = Math;
313
314
 
315
+ const tempScaleData$1 = {};
316
+
314
317
  const MathHelper = {
315
318
  within(value, min, max) {
316
319
  if (isObject(min)) max = min.max, min = min.min;
@@ -354,6 +357,24 @@ const MathHelper = {
354
357
  } else if (scale) MathHelper.assignScale(scaleData, scale);
355
358
  return scaleData;
356
359
  },
360
+ getScaleFixedData(worldScaleData, scaleFixed, unscale, abs, _localScaleData) {
361
+ let {scaleX: scaleX, scaleY: scaleY} = worldScaleData;
362
+ if (abs || scaleFixed) scaleX < 0 && (scaleX = -scaleX), scaleY < 0 && (scaleY = -scaleY);
363
+ if (scaleFixed) {
364
+ if (scaleFixed === true) {
365
+ scaleX = scaleY = unscale ? 1 : 1 / scaleX;
366
+ } else {
367
+ let minScale;
368
+ if (isNumber(scaleFixed)) minScale = scaleFixed; else if (scaleFixed === "zoom-in") minScale = 1;
369
+ if (minScale) {
370
+ if (scaleX > minScale || scaleY > minScale) scaleX = scaleY = unscale ? 1 : 1 / scaleX; else scaleX = scaleY = unscale ? 1 : 1 / minScale;
371
+ }
372
+ }
373
+ }
374
+ tempScaleData$1.scaleX = scaleX;
375
+ tempScaleData$1.scaleY = scaleY;
376
+ return tempScaleData$1;
377
+ },
357
378
  assignScale(scaleData, scale) {
358
379
  if (isNumber(scale)) {
359
380
  scaleData.scaleX = scaleData.scaleY = scale;
@@ -850,8 +871,8 @@ const PointHelper = {
850
871
  if (isObject(originPoints[0])) points = [], originPoints.forEach(p => points.push(p.x, p.y));
851
872
  return points;
852
873
  },
853
- isSame(t, point) {
854
- return float$2(t.x) === float$2(point.x) && float$2(t.y) === float$2(point.y);
874
+ isSame(t, point, quick) {
875
+ return quick ? t.x === point.x && t.y === point.y : float$2(t.x) === float$2(point.x) && float$2(t.y) === float$2(point.y);
855
876
  },
856
877
  reset(t) {
857
878
  P$5.reset(t);
@@ -926,8 +947,8 @@ class Point {
926
947
  getAtan2(to) {
927
948
  return PointHelper.getAtan2(this, to);
928
949
  }
929
- isSame(point) {
930
- return PointHelper.isSame(this, point);
950
+ isSame(point, quick) {
951
+ return PointHelper.isSame(this, point, quick);
931
952
  }
932
953
  reset() {
933
954
  PointHelper.reset(this);
@@ -1183,9 +1204,9 @@ const AroundHelper = {
1183
1204
  }
1184
1205
  if (!onlyBoxSize) to.x += box.x, to.y += box.y;
1185
1206
  },
1186
- getPoint(around, box, to) {
1207
+ getPoint(around, box, to, onlyBoxSize = true) {
1187
1208
  if (!to) to = {};
1188
- AroundHelper.toPoint(around, box, to, true);
1209
+ AroundHelper.toPoint(around, box, to, onlyBoxSize);
1189
1210
  return to;
1190
1211
  }
1191
1212
  };
@@ -1452,6 +1473,9 @@ const BoundsHelper = {
1452
1473
  y: y + height
1453
1474
  } ];
1454
1475
  },
1476
+ getPoint(t, around, onlyBoxSize = false, to) {
1477
+ return AroundHelper.getPoint(around, t, to, onlyBoxSize);
1478
+ },
1455
1479
  hitRadiusPoint(t, point, pointMatrix) {
1456
1480
  if (pointMatrix) point = PointHelper.tempToInnerRadiusPointOf(point, pointMatrix);
1457
1481
  return point.x >= t.x - point.radiusX && point.x <= t.x + t.width + point.radiusX && (point.y >= t.y - point.radiusY && point.y <= t.y + t.height + point.radiusY);
@@ -1623,6 +1647,9 @@ class Bounds {
1623
1647
  getPoints() {
1624
1648
  return BoundsHelper.getPoints(this);
1625
1649
  }
1650
+ getPoint(around, onlyBoxSize, to) {
1651
+ return BoundsHelper.getPoint(this, around, onlyBoxSize, to);
1652
+ }
1626
1653
  hitPoint(point, pointMatrix) {
1627
1654
  return BoundsHelper.hitPoint(this, point, pointMatrix);
1628
1655
  }
@@ -1897,7 +1924,10 @@ const UICreator = {
1897
1924
  list$1[tag] = UI;
1898
1925
  },
1899
1926
  get(tag, data, x, y, width, height) {
1900
- if (!list$1[tag]) debug$e.error("not register " + tag);
1927
+ if (!list$1[tag]) {
1928
+ debug$e.warn("not register " + tag);
1929
+ return undefined;
1930
+ }
1901
1931
  const ui = new list$1[tag](data);
1902
1932
  if (!isUndefined(x)) {
1903
1933
  ui.x = x;
@@ -3754,10 +3784,10 @@ function canvasPatch(drawer) {
3754
3784
  const FileHelper = {
3755
3785
  alphaPixelTypes: [ "png", "webp", "svg" ],
3756
3786
  upperCaseTypeMap: {},
3757
- mineType(type) {
3758
- if (!type || type.startsWith("image")) return type;
3787
+ mimeType(type, base = "image") {
3788
+ if (!type || type.startsWith(base)) return type;
3759
3789
  if (type === "jpg") type = "jpeg";
3760
- return "image/" + type;
3790
+ return base + "/" + type;
3761
3791
  },
3762
3792
  fileType(filename) {
3763
3793
  const l = filename.split(".");
@@ -3790,6 +3820,8 @@ const FileHelper = {
3790
3820
 
3791
3821
  const F = FileHelper;
3792
3822
 
3823
+ F.mineType = F.mimeType;
3824
+
3793
3825
  F.alphaPixelTypes.forEach(type => F.upperCaseTypeMap[type] = type.toUpperCase());
3794
3826
 
3795
3827
  const debug$9 = Debug.get("TaskProcessor");
@@ -4034,6 +4066,9 @@ const debug$8 = Debug.get("Resource");
4034
4066
 
4035
4067
  const Resource = {
4036
4068
  tasker: new TaskProcessor,
4069
+ queue: new TaskProcessor({
4070
+ parallel: 1
4071
+ }),
4037
4072
  map: {},
4038
4073
  get isComplete() {
4039
4074
  return R.tasker.isComplete;
@@ -4070,6 +4105,12 @@ const Resource = {
4070
4105
  R.set(key, value);
4071
4106
  return value;
4072
4107
  },
4108
+ loadFilm(_key, _format) {
4109
+ return undefined;
4110
+ },
4111
+ loadVideo(_key, _format) {
4112
+ return undefined;
4113
+ },
4073
4114
  destroy() {
4074
4115
  R.map = {};
4075
4116
  }
@@ -4080,16 +4121,15 @@ const R = Resource;
4080
4121
  const ImageManager = {
4081
4122
  maxRecycled: 10,
4082
4123
  recycledList: [],
4083
- patternTasker: new TaskProcessor({
4084
- parallel: 1
4085
- }),
4086
- get(config) {
4124
+ patternTasker: Resource.queue,
4125
+ get(config, type) {
4087
4126
  let image = Resource.get(config.url);
4088
- if (!image) Resource.set(config.url, image = Creator.image(config));
4127
+ if (!image) Resource.set(config.url, image = type === "film" ? Creator.film(config) : Creator.image(config));
4089
4128
  image.use++;
4090
4129
  return image;
4091
4130
  },
4092
4131
  recycle(image) {
4132
+ if (image.parent) image = image.parent;
4093
4133
  image.use--;
4094
4134
  setTimeout(() => {
4095
4135
  if (!image.use) {
@@ -4120,7 +4160,7 @@ const ImageManager = {
4120
4160
  if (config.format) return config.format === format;
4121
4161
  const {url: url} = config;
4122
4162
  if (url.startsWith("data:")) {
4123
- if (url.startsWith("data:" + FileHelper.mineType(format))) return true;
4163
+ if (url.startsWith("data:" + FileHelper.mimeType(format))) return true;
4124
4164
  } else {
4125
4165
  if (url.includes("." + format) || url.includes("." + FileHelper.upperCaseTypeMap[format])) return true; else if (format === "png" && !url.includes(".")) return true;
4126
4166
  }
@@ -4136,6 +4176,9 @@ const I$1 = ImageManager;
4136
4176
  const {IMAGE: IMAGE, create: create$1} = IncrementId;
4137
4177
 
4138
4178
  class LeaferImage {
4179
+ get tag() {
4180
+ return "Image";
4181
+ }
4139
4182
  get url() {
4140
4183
  return this.config.url;
4141
4184
  }
@@ -4164,7 +4207,7 @@ class LeaferImage {
4164
4207
  if (!this.loading) {
4165
4208
  this.loading = true;
4166
4209
  Resource.tasker.add(() => __awaiter(this, void 0, void 0, function*() {
4167
- return yield Platform.origin.loadImage(this.getLoadUrl(thumbSize), this.crossOrigin, this).then(img => {
4210
+ return yield Platform.origin["load" + this.tag](this.getLoadUrl(thumbSize), this.crossOrigin, this).then(img => {
4168
4211
  if (thumbSize) this.setThumbView(img);
4169
4212
  this.setView(img);
4170
4213
  }).catch(e => {
@@ -4238,6 +4281,9 @@ class LeaferImage {
4238
4281
  Platform.image.setPatternTransform(pattern, transform, paint);
4239
4282
  return pattern;
4240
4283
  }
4284
+ render(canvas, x, y, width, height, _leaf, _paint, _imageScaleX, _imageScaleY) {
4285
+ canvas.drawImage(this.view, x, y, width, height);
4286
+ }
4241
4287
  getLoadUrl(_thumbSize) {
4242
4288
  return this.url;
4243
4289
  }
@@ -4252,8 +4298,10 @@ class LeaferImage {
4252
4298
  return undefined;
4253
4299
  }
4254
4300
  clearLevels(_checkUse) {}
4301
+ destroyFilter() {}
4255
4302
  destroy() {
4256
4303
  this.clearLevels();
4304
+ this.destroyFilter();
4257
4305
  const {view: view} = this;
4258
4306
  if (view && view.close) view.close();
4259
4307
  this.config = {
@@ -4264,6 +4312,18 @@ class LeaferImage {
4264
4312
  }
4265
4313
  }
4266
4314
 
4315
+ class LeaferFilm extends LeaferImage {
4316
+ get tag() {
4317
+ return "Film";
4318
+ }
4319
+ }
4320
+
4321
+ class LeaferVideo extends LeaferImage {
4322
+ get tag() {
4323
+ return "Video";
4324
+ }
4325
+ }
4326
+
4267
4327
  function defineKey(target, key, descriptor, noConfigurable) {
4268
4328
  if (!noConfigurable) descriptor.configurable = descriptor.enumerable = true;
4269
4329
  Object.defineProperty(target, key, descriptor);
@@ -4438,7 +4498,6 @@ function dimType(defaultValue) {
4438
4498
  if (this.__setAttr(key, value)) {
4439
4499
  const data = this.__;
4440
4500
  DataHelper.stintSet(data, "__useDim", data.dim || data.bright || data.dimskip);
4441
- this.__layout.surfaceChange();
4442
4501
  }
4443
4502
  }
4444
4503
  }));
@@ -4488,7 +4547,6 @@ function sortType(defaultValue) {
4488
4547
  return decorateLeafAttr(defaultValue, key => attr({
4489
4548
  set(value) {
4490
4549
  if (this.__setAttr(key, value)) {
4491
- this.__layout.surfaceChange();
4492
4550
  this.waitParent(() => {
4493
4551
  this.parent.__layout.childrenSortChange();
4494
4552
  });
@@ -4525,7 +4583,6 @@ function hitType(defaultValue) {
4525
4583
  set(value) {
4526
4584
  if (this.__setAttr(key, value)) {
4527
4585
  this.__layout.hitCanvasChanged = true;
4528
- if (Debug.showBounds === "hit") this.__layout.surfaceChange();
4529
4586
  if (this.leafer) this.leafer.updateCursor();
4530
4587
  }
4531
4588
  }
@@ -4731,6 +4788,10 @@ const LeafHelper = {
4731
4788
  if (layout.stateStyleChanged) leaf.updateState();
4732
4789
  if (layout.opacityChanged) updateAllWorldOpacity(leaf);
4733
4790
  leaf.__updateChange();
4791
+ if (layout.surfaceChanged) {
4792
+ if (leaf.__hasComplex) L.updateComplex(leaf);
4793
+ layout.surfaceChanged = false;
4794
+ }
4734
4795
  },
4735
4796
  updateAllChange(leaf) {
4736
4797
  updateChange$1(leaf);
@@ -4755,6 +4816,9 @@ const LeafHelper = {
4755
4816
  if (!fromWorld) fromWorld = leaf.__nowWorld;
4756
4817
  if (leaf.__worldFlipped || Platform.fullImageShadow) currentCanvas.copyWorldByReset(fromCanvas, fromWorld, leaf.__nowWorld, blendMode, onlyResetTransform); else currentCanvas.copyWorldToInner(fromCanvas, fromWorld, leaf.__layout.renderBounds, blendMode);
4757
4818
  },
4819
+ renderComplex(_leaf, _canvas, _options) {},
4820
+ updateComplex(_leaf) {},
4821
+ checkComplex(_leaf) {},
4758
4822
  moveWorld(t, x, y = 0, isInnerPoint, transition) {
4759
4823
  const local = isObject(x) ? Object.assign({}, x) : {
4760
4824
  x: x,
@@ -4866,6 +4930,9 @@ const LeafHelper = {
4866
4930
  divideParent(matrix$1, relative.scrollWorldTransform);
4867
4931
  return temp ? matrix$1 : Object.assign({}, matrix$1);
4868
4932
  },
4933
+ updateScaleFixedWorld(_t) {},
4934
+ updateOuterBounds(_t) {},
4935
+ cacheId(_t) {},
4869
4936
  drop(t, parent, index, resize) {
4870
4937
  t.setTransform(L.getRelativeWorld(t, parent, true), resize);
4871
4938
  parent.add(t, index);
@@ -4916,7 +4983,8 @@ const LeafBoundsHelper = {
4916
4983
  return target.__.eraser || target.__.visible === 0 ? null : target.__layout.localStrokeBounds;
4917
4984
  },
4918
4985
  localRenderBounds(target) {
4919
- return target.__.eraser || target.__.visible === 0 ? null : target.__layout.localRenderBounds;
4986
+ const {__: __, __layout: __layout} = target;
4987
+ return __.eraser || __.visible === 0 ? null : __layout.localOuterBounds || __layout.localRenderBounds;
4920
4988
  },
4921
4989
  maskLocalBoxBounds(target, index) {
4922
4990
  return checkMask(target, index) && target.__localBoxBounds;
@@ -4925,7 +4993,8 @@ const LeafBoundsHelper = {
4925
4993
  return checkMask(target, index) && target.__layout.localStrokeBounds;
4926
4994
  },
4927
4995
  maskLocalRenderBounds(target, index) {
4928
- return checkMask(target, index) && target.__layout.localRenderBounds;
4996
+ const {__layout: __layout} = target;
4997
+ return checkMask(target, index) && (__layout.localOuterBounds || __layout.localRenderBounds);
4929
4998
  },
4930
4999
  excludeRenderBounds(child, options) {
4931
5000
  if (options.bounds && !options.bounds.hit(child.__world, options.matrix)) return true;
@@ -5445,7 +5514,6 @@ class LeafLayout {
5445
5514
  }
5446
5515
  opacityChange() {
5447
5516
  this.opacityChanged = true;
5448
- this.surfaceChanged || this.surfaceChange();
5449
5517
  }
5450
5518
  childrenSortChange() {
5451
5519
  if (!this.childrenSortChanged) {
@@ -5938,6 +6006,7 @@ const LeafMatrix = {
5938
6006
  const {parent: parent, __layout: __layout, __world: __world, __scrollWorld: __scrollWorld, __: __} = this;
5939
6007
  multiplyParent$2(this.__local || __layout, parent ? parent.__scrollWorld || parent.__world : defaultWorld, __world, !!__layout.affectScaleOrRotation, __);
5940
6008
  if (__scrollWorld) translateInner(Object.assign(__scrollWorld, __world), __.scrollX, __.scrollY);
6009
+ if (__layout.scaleFixed) LeafHelper.updateScaleFixedWorld(this);
5941
6010
  },
5942
6011
  __updateLocalMatrix() {
5943
6012
  if (this.__local) {
@@ -5971,6 +6040,7 @@ const LeafBounds = {
5971
6040
  __updateWorldBounds() {
5972
6041
  const {__layout: __layout, __world: __world} = this;
5973
6042
  toOuterOf$2(__layout.renderBounds, __world, __world);
6043
+ if (this.__hasComplex) LeafHelper.checkComplex(this);
5974
6044
  if (__layout.resized) {
5975
6045
  if (__layout.resized === "inner") this.__onUpdateSize();
5976
6046
  if (this.__hasLocalEvent) BoundsEvent.emitLocal(this);
@@ -6020,6 +6090,7 @@ const LeafBounds = {
6020
6090
  layout.renderChanged = undefined;
6021
6091
  if (this.parent) this.parent.__layout.renderChange();
6022
6092
  }
6093
+ if (layout.outerScale) LeafHelper.updateOuterBounds(this);
6023
6094
  layout.resized || (layout.resized = "local");
6024
6095
  layout.boundsChanged = undefined;
6025
6096
  },
@@ -6086,7 +6157,7 @@ const LeafRender = {
6086
6157
  const data = this.__;
6087
6158
  if (data.bright && !options.topRendering) return options.topList.add(this);
6088
6159
  canvas.setWorld(this.__nowWorld = this.__getNowWorld(options));
6089
- canvas.opacity = options.dimOpacity && !data.dimskip ? data.opacity * options.dimOpacity : data.opacity;
6160
+ canvas.opacity = options.ignoreOpacity ? 1 : options.dimOpacity && !data.dimskip ? data.opacity * options.dimOpacity : data.opacity;
6090
6161
  if (this.__.__single) {
6091
6162
  if (data.eraser === "path") return this.__renderEraser(canvas, options);
6092
6163
  const tempCanvas = canvas.getSameCanvas(true, true);
@@ -6140,7 +6211,7 @@ const BranchRender = {
6140
6211
  if (data.eraser === "path") return this.__renderEraser(canvas, options);
6141
6212
  const tempCanvas = canvas.getSameCanvas(false, true);
6142
6213
  this.__renderBranch(tempCanvas, options);
6143
- canvas.opacity = options.dimOpacity ? data.opacity * options.dimOpacity : data.opacity;
6214
+ canvas.opacity = options.ignoreOpacity ? 1 : options.dimOpacity ? data.opacity * options.dimOpacity : data.opacity;
6144
6215
  canvas.copyWorldByReset(tempCanvas, nowWorld, nowWorld, data.__blendMode, true);
6145
6216
  tempCanvas.recycle(nowWorld);
6146
6217
  } else {
@@ -6152,9 +6223,11 @@ const BranchRender = {
6152
6223
  if (this.__hasMask) {
6153
6224
  this.__renderMask(canvas, options);
6154
6225
  } else {
6226
+ let child;
6155
6227
  const {children: children} = this;
6156
6228
  for (let i = 0, len = children.length; i < len; i++) {
6157
- excludeRenderBounds$1(children[i], options) || children[i].__render(canvas, options);
6229
+ child = children[i];
6230
+ excludeRenderBounds$1(child, options) || (child.__hasComplex ? LeafHelper.renderComplex(child, canvas, options) : child.__render(canvas, options));
6158
6231
  }
6159
6232
  }
6160
6233
  },
@@ -6168,8 +6241,6 @@ const BranchRender = {
6168
6241
  }
6169
6242
  };
6170
6243
 
6171
- const tempScaleData$1 = {};
6172
-
6173
6244
  const {LEAF: LEAF, create: create} = IncrementId;
6174
6245
 
6175
6246
  const {stintSet: stintSet$4} = DataHelper;
@@ -6180,6 +6251,8 @@ const {toOuterOf: toOuterOf$1} = BoundsHelper;
6180
6251
 
6181
6252
  const {copy: copy$2, move: move$2} = PointHelper;
6182
6253
 
6254
+ const {getScaleFixedData: getScaleFixedData} = MathHelper;
6255
+
6183
6256
  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;
6184
6257
 
6185
6258
  let Leaf = class Leaf {
@@ -6338,6 +6411,7 @@ let Leaf = class Leaf {
6338
6411
  this.__level = this.parent ? this.parent.__level + 1 : 1;
6339
6412
  if (this.animation) this.__runAnimation("in");
6340
6413
  if (this.__bubbleMap) this.__emitLifeEvent(ChildEvent.MOUNTED);
6414
+ if (leafer.cacheId) LeafHelper.cacheId(this);
6341
6415
  } else {
6342
6416
  this.__emitLifeEvent(ChildEvent.UNMOUNTED);
6343
6417
  }
@@ -6467,13 +6541,8 @@ let Leaf = class Leaf {
6467
6541
  if (scaleX < 0) scaleX = -scaleX;
6468
6542
  return scaleX > 1 ? scaleX : 1;
6469
6543
  }
6470
- getRenderScaleData(abs, scaleFixed) {
6471
- let {scaleX: scaleX, scaleY: scaleY} = ImageManager.patternLocked ? this.__world : this.__nowWorld;
6472
- if (abs) scaleX < 0 && (scaleX = -scaleX), scaleY < 0 && (scaleY = -scaleY);
6473
- if (scaleFixed === true || scaleFixed === "zoom-in" && scaleX > 1 && scaleY > 1) scaleX = scaleY = 1;
6474
- tempScaleData$1.scaleX = scaleX;
6475
- tempScaleData$1.scaleY = scaleY;
6476
- return tempScaleData$1;
6544
+ getRenderScaleData(abs, scaleFixed, unscale = true) {
6545
+ return getScaleFixedData(ImageManager.patternLocked ? this.__world : this.__nowWorld || this.__world, scaleFixed, unscale, abs);
6477
6546
  }
6478
6547
  getTransform(relative) {
6479
6548
  return this.__layout.getTransform(relative || "local");
@@ -6645,7 +6714,7 @@ let Leaf = class Leaf {
6645
6714
  __drawPath(_canvas) {}
6646
6715
  __drawRenderPath(_canvas) {}
6647
6716
  __updatePath() {}
6648
- __updateRenderPath() {}
6717
+ __updateRenderPath(_updateCache) {}
6649
6718
  getMotionPathData() {
6650
6719
  return Plugin.need("path");
6651
6720
  }
@@ -6719,9 +6788,11 @@ let Branch = class Branch extends Leaf {
6719
6788
  return 0;
6720
6789
  }
6721
6790
  __updateRenderSpread() {
6791
+ let layout;
6722
6792
  const {children: children} = this;
6723
6793
  for (let i = 0, len = children.length; i < len; i++) {
6724
- if (children[i].__layout.renderSpread) return 1;
6794
+ layout = children[i].__layout;
6795
+ if (layout.renderSpread || layout.localOuterBounds) return 1;
6725
6796
  }
6726
6797
  return 0;
6727
6798
  }
@@ -6754,6 +6825,7 @@ let Branch = class Branch extends Leaf {
6754
6825
  this.add(item, index);
6755
6826
  noIndex || index++;
6756
6827
  }); else child = UICreator.get(child.tag, child);
6828
+ if (!child) return;
6757
6829
  }
6758
6830
  if (child.parent) child.parent.remove(child);
6759
6831
  child.parent = this;
@@ -6979,7 +7051,7 @@ class LeafLevelList {
6979
7051
  }
6980
7052
  }
6981
7053
 
6982
- const version = "2.0.1";
7054
+ const version = "2.0.3";
6983
7055
 
6984
7056
  class LeaferCanvas extends LeaferCanvasBase {
6985
7057
  get allowBackgroundColor() {
@@ -7084,8 +7156,6 @@ class LeaferCanvas extends LeaferCanvasBase {
7084
7156
  }
7085
7157
  }
7086
7158
 
7087
- const {mineType: mineType, fileType: fileType} = FileHelper;
7088
-
7089
7159
  Object.assign(Creator, {
7090
7160
  canvas: (options, manager) => new LeaferCanvas(options, manager),
7091
7161
  image: options => new LeaferImage(options)
@@ -7101,12 +7171,12 @@ function useCanvas(_canvasType, app) {
7101
7171
  };
7102
7172
  return app.createOffscreenCanvas ? app.createOffscreenCanvas(data) : app.createOffScreenCanvas(data);
7103
7173
  },
7104
- canvasToDataURL: (canvas, type, quality) => canvas.toDataURL(mineType(type), quality),
7174
+ canvasToDataURL: (canvas, type, quality) => canvas.toDataURL(FileHelper.mimeType(type), quality),
7105
7175
  canvasToBolb: (canvas, type, quality) => canvas.toBuffer(type, {
7106
7176
  quality: quality
7107
7177
  }),
7108
7178
  canvasSaveAs: (canvas, filePath, quality) => {
7109
- let data = canvas.toDataURL(mineType(fileType(filePath)), quality);
7179
+ let data = canvas.toDataURL(FileHelper.mimeType(FileHelper.fileType(filePath)), quality);
7110
7180
  data = data.substring(data.indexOf("64,") + 3);
7111
7181
  return Platform.origin.download(data, filePath);
7112
7182
  },
@@ -7140,7 +7210,7 @@ function useCanvas(_canvasType, app) {
7140
7210
  });
7141
7211
  });
7142
7212
  },
7143
- loadImage(src) {
7213
+ loadImage(src, _crossOrigin, _leaferImage) {
7144
7214
  return new Promise((resolve, reject) => {
7145
7215
  const img = Platform.canvas.view.createImage();
7146
7216
  img.onload = () => {
@@ -7152,6 +7222,14 @@ function useCanvas(_canvasType, app) {
7152
7222
  img.src = Platform.image.getRealURL(src);
7153
7223
  });
7154
7224
  },
7225
+ loadContent(url, responseType = "text") {
7226
+ return new Promise((resolve, reject) => app.request({
7227
+ url: url,
7228
+ responseType: responseType === "arrayBuffer" ? "arraybuffer" : "text",
7229
+ success: res => resolve(responseType === "json" && typeof res.data === "string" ? JSON.parse(res.data) : res.data),
7230
+ fail: reject
7231
+ }));
7232
+ },
7155
7233
  noRepeat: "repeat-x"
7156
7234
  };
7157
7235
  Platform.miniapp = {
@@ -7703,7 +7781,7 @@ class Renderer {
7703
7781
  getCellList() {
7704
7782
  return undefined;
7705
7783
  }
7706
- addBlock(block) {
7784
+ addBlock(block, _leafList) {
7707
7785
  if (!this.updateBlocks) this.updateBlocks = [];
7708
7786
  this.updateBlocks.push(block);
7709
7787
  }
@@ -7751,7 +7829,8 @@ class Renderer {
7751
7829
  __onLayoutEnd(event) {
7752
7830
  if (event.data) event.data.map(item => {
7753
7831
  let empty;
7754
- if (item.updatedList) item.updatedList.list.some(leaf => {
7832
+ const {updatedList: updatedList} = item;
7833
+ if (updatedList) updatedList.list.some(leaf => {
7755
7834
  empty = !leaf.__world.width || !leaf.__world.height;
7756
7835
  if (empty) {
7757
7836
  if (!leaf.isLeafer) debug$3.tip(leaf.innerName, ": empty");
@@ -7759,7 +7838,7 @@ class Renderer {
7759
7838
  }
7760
7839
  return empty;
7761
7840
  });
7762
- this.addBlock(empty ? this.canvas.bounds : item.updatedBounds);
7841
+ this.addBlock(empty ? this.canvas.bounds : item.updatedBounds, updatedList);
7763
7842
  });
7764
7843
  }
7765
7844
  emitRender(type, bounds, options) {
@@ -7965,7 +8044,7 @@ class Selector {
7965
8044
  this.config = {};
7966
8045
  if (userConfig) this.config = DataHelper.default(userConfig, this.config);
7967
8046
  this.picker = new Picker(this.target = target, this);
7968
- this.finder = Creator.finder && Creator.finder();
8047
+ this.finder = Creator.finder && Creator.finder(target, this.config);
7969
8048
  }
7970
8049
  getByPoint(hitPoint, hitRadius, options) {
7971
8050
  const {target: target, picker: picker} = this;
@@ -8007,7 +8086,9 @@ function effectType(defaultValue) {
8007
8086
  set(value) {
8008
8087
  this.__setAttr(key, value);
8009
8088
  if (value) this.__.__useEffect = true;
8010
- this.__layout.renderChanged || this.__layout.renderChange();
8089
+ const layout = this.__layout;
8090
+ layout.renderChanged || layout.renderChange();
8091
+ layout.surfaceChange();
8011
8092
  }
8012
8093
  }));
8013
8094
  }
@@ -8221,15 +8302,16 @@ class UIData extends LeafData {
8221
8302
  this.__needComputePaint = undefined;
8222
8303
  }
8223
8304
  __getRealStrokeWidth(childStyle) {
8224
- let {strokeWidth: strokeWidth, strokeWidthFixed: strokeWidthFixed} = this;
8305
+ let {strokeWidth: strokeWidth, strokeScaleFixed: strokeScaleFixed} = this;
8225
8306
  if (childStyle) {
8226
8307
  if (childStyle.strokeWidth) strokeWidth = childStyle.strokeWidth;
8227
- if (!isUndefined(childStyle.strokeWidthFixed)) strokeWidthFixed = childStyle.strokeWidthFixed;
8308
+ if (!isUndefined(childStyle.strokeScaleFixed)) strokeScaleFixed = childStyle.strokeScaleFixed;
8309
+ }
8310
+ if (strokeScaleFixed) {
8311
+ const {scaleX: scaleX} = this.__leaf.getRenderScaleData(true, strokeScaleFixed, false);
8312
+ if (scaleX !== 1) return strokeWidth * scaleX;
8228
8313
  }
8229
- if (strokeWidthFixed) {
8230
- const scale = this.__leaf.getClampRenderScale();
8231
- return scale > 1 ? strokeWidth / scale : strokeWidth;
8232
- } else return strokeWidth;
8314
+ return strokeWidth;
8233
8315
  }
8234
8316
  __setPaint(attrName, value) {
8235
8317
  this.__setInput(attrName, value);
@@ -8367,13 +8449,16 @@ class TextData extends UIData {
8367
8449
  }
8368
8450
 
8369
8451
  class ImageData extends RectData {
8452
+ get __urlType() {
8453
+ return "image";
8454
+ }
8370
8455
  setUrl(value) {
8371
8456
  this.__setImageFill(value);
8372
8457
  this._url = value;
8373
8458
  }
8374
8459
  __setImageFill(value) {
8375
8460
  this.fill = value ? {
8376
- type: "image",
8461
+ type: this.__urlType,
8377
8462
  mode: "stretch",
8378
8463
  url: value
8379
8464
  } : undefined;
@@ -8412,7 +8497,7 @@ const UIBounds = {
8412
8497
  const data = this.__, {strokeAlign: strokeAlign, __maxStrokeWidth: strokeWidth} = data, box = this.__box;
8413
8498
  if ((data.stroke || data.hitStroke === "all") && strokeWidth && strokeAlign !== "inside") {
8414
8499
  boxSpread = spread = strokeAlign === "center" ? strokeWidth / 2 : strokeWidth;
8415
- if (!data.__boxStroke) {
8500
+ if (!data.__boxStroke || data.__useArrow) {
8416
8501
  const miterLimitAddWidth = data.__isLinePath ? 0 : 10 * spread;
8417
8502
  const storkeCapAddWidth = data.strokeCap === "none" ? 0 : strokeWidth;
8418
8503
  spread += Math.max(miterLimitAddWidth, storkeCapAddWidth);
@@ -8569,6 +8654,12 @@ let UI = UI_1 = class UI extends Leaf {
8569
8654
  get isFrame() {
8570
8655
  return false;
8571
8656
  }
8657
+ set strokeWidthFixed(value) {
8658
+ this.strokeScaleFixed = value;
8659
+ }
8660
+ get strokeWidthFixed() {
8661
+ return this.strokeScaleFixed;
8662
+ }
8572
8663
  set scale(value) {
8573
8664
  MathHelper.assignScale(this, value);
8574
8665
  }
@@ -8624,6 +8715,9 @@ let UI = UI_1 = class UI extends Leaf {
8624
8715
  getPathString(curve, pathForRender, floatLength) {
8625
8716
  return PathConvert.stringify(this.getPath(curve, pathForRender), floatLength);
8626
8717
  }
8718
+ asPath(curve, pathForRender) {
8719
+ this.path = this.getPath(curve, pathForRender);
8720
+ }
8627
8721
  load() {
8628
8722
  this.__.__computePaint();
8629
8723
  }
@@ -8633,16 +8727,18 @@ let UI = UI_1 = class UI extends Leaf {
8633
8727
  data.lazy && !this.__inLazyBounds && !Export.running ? data.__needComputePaint = true : data.__computePaint();
8634
8728
  }
8635
8729
  }
8636
- __updateRenderPath() {
8730
+ __updateRenderPath(updateCache) {
8637
8731
  const data = this.__;
8638
8732
  if (data.path) {
8639
8733
  data.__pathForRender = data.cornerRadius ? PathCorner.smooth(data.path, data.cornerRadius, data.cornerSmoothing) : data.path;
8640
- if (data.__useArrow) PathArrow.addArrows(this);
8734
+ if (data.__useArrow) PathArrow.addArrows(this, updateCache);
8641
8735
  } else data.__pathForRender && (data.__pathForRender = undefined);
8642
8736
  }
8643
8737
  __drawRenderPath(canvas) {
8738
+ const data = this.__;
8644
8739
  canvas.beginPath();
8645
- this.__drawPathByData(canvas, this.__.__pathForRender);
8740
+ if (data.__useArrow) PathArrow.updateArrow(this);
8741
+ this.__drawPathByData(canvas, data.__pathForRender);
8646
8742
  }
8647
8743
  __drawPath(canvas) {
8648
8744
  canvas.beginPath();
@@ -8691,6 +8787,7 @@ let UI = UI_1 = class UI extends Leaf {
8691
8787
  static setEditOuter(_toolName) {}
8692
8788
  static setEditInner(_editorName) {}
8693
8789
  destroy() {
8790
+ this.__.__willDestroy = true;
8694
8791
  this.fill = this.stroke = null;
8695
8792
  if (this.__animate) this.killAnimate();
8696
8793
  super.destroy();
@@ -8807,7 +8904,7 @@ __decorate([ strokeType("inside") ], UI.prototype, "strokeAlign", void 0);
8807
8904
 
8808
8905
  __decorate([ strokeType(1, true) ], UI.prototype, "strokeWidth", void 0);
8809
8906
 
8810
- __decorate([ strokeType(false) ], UI.prototype, "strokeWidthFixed", void 0);
8907
+ __decorate([ strokeType(false) ], UI.prototype, "strokeScaleFixed", void 0);
8811
8908
 
8812
8909
  __decorate([ strokeType("none") ], UI.prototype, "strokeCap", void 0);
8813
8910
 
@@ -8873,7 +8970,10 @@ let Group = class Group extends UI {
8873
8970
  }
8874
8971
  toJSON(options) {
8875
8972
  const data = super.toJSON(options);
8876
- if (!this.childlessJSON) data.children = this.children.map(child => child.toJSON(options));
8973
+ if (!this.childlessJSON) {
8974
+ const children = data.children = [];
8975
+ this.children.forEach(child => child.skipJSON || children.push(child.toJSON(options)));
8976
+ }
8877
8977
  return data;
8878
8978
  }
8879
8979
  pick(_hitPoint, _options) {
@@ -9022,12 +9122,12 @@ let Leafer = Leafer_1 = class Leafer extends Group {
9022
9122
  this.emitLeafer(LeaferEvent.STOP);
9023
9123
  }
9024
9124
  }
9025
- unlockLayout() {
9125
+ unlockLayout(updateLayout = true) {
9026
9126
  this.layouter.start();
9027
- this.updateLayout();
9127
+ if (updateLayout) this.updateLayout();
9028
9128
  }
9029
- lockLayout() {
9030
- this.updateLayout();
9129
+ lockLayout(updateLayout = true) {
9130
+ if (updateLayout) this.updateLayout();
9031
9131
  this.layouter.stop();
9032
9132
  }
9033
9133
  resize(size) {
@@ -9436,9 +9536,9 @@ let Ellipse = class Ellipse extends UI {
9436
9536
  return "Ellipse";
9437
9537
  }
9438
9538
  __updatePath() {
9439
- const {width: width, height: height, innerRadius: innerRadius, startAngle: startAngle, endAngle: endAngle} = this.__;
9539
+ const data = this.__, {width: width, height: height, innerRadius: innerRadius, startAngle: startAngle, endAngle: endAngle} = data;
9440
9540
  const rx = width / 2, ry = height / 2;
9441
- const path = this.__.path = [];
9541
+ const path = data.path = [];
9442
9542
  let open;
9443
9543
  if (innerRadius) {
9444
9544
  if (startAngle || endAngle) {
@@ -9460,7 +9560,7 @@ let Ellipse = class Ellipse extends UI {
9460
9560
  }
9461
9561
  }
9462
9562
  if (!open) closePath$2(path);
9463
- if (Platform.ellipseToCurve) this.__.path = this.getPath(true);
9563
+ if (Platform.ellipseToCurve || data.__useArrow) data.path = this.getPath(true);
9464
9564
  }
9465
9565
  };
9466
9566
 
@@ -10000,7 +10100,7 @@ let App = class App extends Leafer {
10000
10100
  if (this.viewReady) this.renderer.update();
10001
10101
  }
10002
10102
  __render(canvas, options) {
10003
- if (canvas.context) this.forEach(leafer => options.matrix ? leafer.__render(canvas, options) : canvas.copyWorld(leafer.canvas, options.bounds));
10103
+ if (canvas.context) this.forEach(leafer => options.matrix ? leafer.__render(canvas, options) : canvas.copyWorld(leafer.canvas, options.bounds, undefined, undefined, true));
10004
10104
  }
10005
10105
  __onResize(event) {
10006
10106
  this.forEach(leafer => leafer.resize(event));
@@ -10820,6 +10920,7 @@ class InteractionBase {
10820
10920
  this.checkPath(data, useDefaultPath);
10821
10921
  this.downTime = Date.now();
10822
10922
  this.emit(PointerEvent.BEFORE_DOWN, data);
10923
+ if (data.path.needUpdate) this.updateDownData(data);
10823
10924
  this.emit(PointerEvent.DOWN, data);
10824
10925
  if (PointerButton.left(data)) {
10825
10926
  this.tapWait();
@@ -11554,8 +11655,8 @@ function fills(fills, ui, canvas, renderOptions) {
11554
11655
  canvas.save();
11555
11656
  if (item.transform) canvas.transform(item.transform);
11556
11657
  if (originPaint.scaleFixed) {
11557
- const {scaleX: scaleX, scaleY: scaleY} = ui.getRenderScaleData(true);
11558
- if (originPaint.scaleFixed === true || originPaint.scaleFixed === "zoom-in" && scaleX > 1 && scaleY > 1) canvas.scale(1 / scaleX, 1 / scaleY);
11658
+ const {scaleX: scaleX, scaleY: scaleY} = ui.getRenderScaleData(true, originPaint.scaleFixed, false);
11659
+ if (scaleX !== 1) canvas.scale(scaleX, scaleY);
11559
11660
  }
11560
11661
  if (originPaint.blendMode) canvas.blendMode = originPaint.blendMode;
11561
11662
  fillPathOrText(ui, canvas, renderOptions);
@@ -11829,11 +11930,14 @@ function compute(attrName, ui) {
11829
11930
  function getLeafPaint(attrName, paint, ui) {
11830
11931
  if (!isObject(paint) || paint.visible === false || paint.opacity === 0) return undefined;
11831
11932
  let leafPaint;
11832
- const {boxBounds: boxBounds} = ui.__layout;
11833
- switch (paint.type) {
11933
+ const {boxBounds: boxBounds} = ui.__layout, {type: type} = paint;
11934
+ switch (type) {
11834
11935
  case "image":
11936
+ case "film":
11937
+ case "video":
11835
11938
  if (!paint.url) return undefined;
11836
11939
  leafPaint = PaintImage.image(ui, attrName, paint, boxBounds, !recycleMap || !recycleMap[paint.url]);
11940
+ if (type !== "image") PaintImage[type](leafPaint);
11837
11941
  break;
11838
11942
 
11839
11943
  case "linear":
@@ -11849,7 +11953,7 @@ function getLeafPaint(attrName, paint, ui) {
11849
11953
  break;
11850
11954
 
11851
11955
  case "solid":
11852
- const {type: type, color: color, opacity: opacity} = paint;
11956
+ const {color: color, opacity: opacity} = paint;
11853
11957
  leafPaint = {
11854
11958
  type: type,
11855
11959
  style: ColorConvert.string(color, opacity)
@@ -11893,7 +11997,7 @@ const {isSame: isSame} = BoundsHelper;
11893
11997
 
11894
11998
  function image(ui, attrName, paint, boxBounds, firstUse) {
11895
11999
  let leafPaint, event;
11896
- const image = ImageManager.get(paint);
12000
+ const image = ImageManager.get(paint, paint.type);
11897
12001
  if (cache && paint === cache.paint && isSame(boxBounds, cache.boxBounds)) {
11898
12002
  leafPaint = cache.leafPaint;
11899
12003
  } else {
@@ -11954,8 +12058,8 @@ function image(ui, attrName, paint, boxBounds, firstUse) {
11954
12058
  }
11955
12059
 
11956
12060
  function checkSizeAndCreateData(ui, attrName, paint, image, leafPaint, boxBounds) {
11957
- if (attrName === "fill" && !ui.__.__naturalWidth) {
11958
- const data = ui.__;
12061
+ const data = ui.__;
12062
+ if (attrName === "fill" && !data.__naturalWidth) {
11959
12063
  data.__naturalWidth = image.width / data.pixelRatio;
11960
12064
  data.__naturalHeight = image.height / data.pixelRatio;
11961
12065
  if (data.__autoSide) {
@@ -11967,7 +12071,13 @@ function checkSizeAndCreateData(ui, attrName, paint, image, leafPaint, boxBounds
11967
12071
  return false;
11968
12072
  }
11969
12073
  }
11970
- if (!leafPaint.data) PaintImage.createData(leafPaint, image, paint, boxBounds);
12074
+ if (!leafPaint.data) {
12075
+ PaintImage.createData(leafPaint, image, paint, boxBounds);
12076
+ const {transform: transform} = leafPaint.data, {opacity: opacity, blendMode: blendMode} = paint;
12077
+ const clip = transform && !transform.onlyScale || data.path || data.cornerRadius;
12078
+ if (clip || opacity && opacity < 1 || blendMode) leafPaint.complex = clip ? 2 : true;
12079
+ }
12080
+ if (paint.filter) PaintImage.applyFilter(leafPaint, image, paint.filter, ui);
11971
12081
  return true;
11972
12082
  }
11973
12083
 
@@ -12010,7 +12120,7 @@ function getPatternData(paint, box, image) {
12010
12120
  if (paint.padding) box = tempBox.set(box).shrink(paint.padding);
12011
12121
  if (paint.mode === "strench") paint.mode = "stretch";
12012
12122
  const {width: width, height: height} = image;
12013
- const {opacity: opacity, mode: mode, align: align, offset: offset, scale: scale, size: size, rotation: rotation, skew: skew, clipSize: clipSize, repeat: repeat, gap: gap, filters: filters, interlace: interlace} = paint;
12123
+ const {mode: mode, align: align, offset: offset, scale: scale, size: size, rotation: rotation, skew: skew, clipSize: clipSize, repeat: repeat, gap: gap, interlace: interlace} = paint;
12014
12124
  const sameBox = box.width === width && box.height === height;
12015
12125
  const data = {
12016
12126
  mode: mode
@@ -12073,8 +12183,6 @@ function getPatternData(paint, box, image) {
12073
12183
  data.scaleX = scaleX;
12074
12184
  data.scaleY = scaleY;
12075
12185
  }
12076
- if (opacity && opacity < 1) data.opacity = opacity;
12077
- if (filters) data.filters = filters;
12078
12186
  if (repeat) data.repeat = isString(repeat) ? repeat === "x" ? "repeat-x" : "repeat-y" : "repeat";
12079
12187
  if (interlace) data.interlace = isNumber(interlace) || interlace.type === "percent" ? {
12080
12188
  type: "x",
@@ -12105,7 +12213,7 @@ const {get: get$2, set: set, rotateOfOuter: rotateOfOuter$1, translate: translat
12105
12213
 
12106
12214
  function stretchMode(data, box, scaleX, scaleY) {
12107
12215
  const transform = get$2(), {x: x, y: y} = box;
12108
- if (x || y) translate(transform, x, y); else transform.onlyScale = true;
12216
+ if (x || y) translate(transform, x, y); else if (scaleX > 0 && scaleY > 0) transform.onlyScale = true;
12109
12217
  scaleHelper(transform, scaleX, scaleY);
12110
12218
  data.transform = transform;
12111
12219
  }
@@ -12194,10 +12302,10 @@ function createPatternTask(paint, ui, canvas, renderOptions) {
12194
12302
  }
12195
12303
 
12196
12304
  function createPattern(paint, ui, canvas, renderOptions) {
12197
- let {scaleX: scaleX, scaleY: scaleY} = PaintImage.getImageRenderScaleData(paint, ui, canvas, renderOptions), id = scaleX + "-" + scaleY;
12305
+ let {scaleX: scaleX, scaleY: scaleY} = PaintImage.getImageRenderScaleData(paint, ui, canvas, renderOptions), id = paint.film ? paint.nowIndex : scaleX + "-" + scaleY;
12198
12306
  if (paint.patternId !== id && !ui.destroyed) {
12199
12307
  if (!(Platform.image.isLarge(paint.image, scaleX, scaleY) && !paint.data.repeat)) {
12200
- const {image: image, data: data} = paint, {transform: transform, gap: gap} = data, fixScale = PaintImage.getPatternFixScale(paint, scaleX, scaleY);
12308
+ const {image: image, data: data} = paint, {opacity: opacity} = paint.originPaint, {transform: transform, gap: gap} = data, fixScale = PaintImage.getPatternFixScale(paint, scaleX, scaleY);
12201
12309
  let imageMatrix, xGap, yGap, {width: width, height: height} = image;
12202
12310
  if (fixScale) scaleX *= fixScale, scaleY *= fixScale;
12203
12311
  width *= scaleX;
@@ -12213,7 +12321,7 @@ function createPattern(paint, ui, canvas, renderOptions) {
12213
12321
  if (transform) copy$1(imageMatrix, transform);
12214
12322
  scale(imageMatrix, 1 / scaleX, 1 / scaleY);
12215
12323
  }
12216
- const imageCanvas = image.getCanvas(width, height, data.opacity, data.filters, xGap, yGap, ui.leafer && ui.leafer.config.smooth, data.interlace);
12324
+ const imageCanvas = image.getCanvas(width, height, opacity, undefined, xGap, yGap, ui.leafer && ui.leafer.config.smooth, data.interlace);
12217
12325
  const pattern = image.getPattern(imageCanvas, data.repeat || (Platform.origin.noRepeat || "no-repeat"), imageMatrix, paint);
12218
12326
  paint.style = pattern;
12219
12327
  paint.patternId = id;
@@ -12234,15 +12342,15 @@ function getPatternFixScale(paint, imageScaleX, imageScaleY) {
12234
12342
  }
12235
12343
 
12236
12344
  function checkImage(paint, drawImage, ui, canvas, renderOptions) {
12237
- const {scaleX: scaleX, scaleY: scaleY} = PaintImage.getImageRenderScaleData(paint, ui, canvas, renderOptions);
12345
+ const {scaleX: scaleX, scaleY: scaleY} = PaintImage.getImageRenderScaleData(paint, ui, canvas, renderOptions), id = paint.film ? paint.nowIndex : scaleX + "-" + scaleY;
12238
12346
  const {image: image, data: data, originPaint: originPaint} = paint, {exporting: exporting, snapshot: snapshot} = renderOptions;
12239
- if (!data || paint.patternId === scaleX + "-" + scaleY && !exporting || snapshot) {
12347
+ if (!data || paint.patternId === id && !exporting || snapshot) {
12240
12348
  return false;
12241
12349
  } else {
12242
12350
  if (drawImage) {
12243
12351
  if (data.repeat) {
12244
12352
  drawImage = false;
12245
- } else if (!(originPaint.changeful || Platform.name === "miniapp" && ResizeEvent.isResizing(ui) || exporting)) {
12353
+ } else if (!(originPaint.changeful || paint.film || Platform.name === "miniapp" && ResizeEvent.isResizing(ui) || exporting)) {
12246
12354
  drawImage = Platform.image.isLarge(image, scaleX, scaleY) || image.width * scaleX > 8096 || image.height * scaleY > 8096;
12247
12355
  }
12248
12356
  }
@@ -12260,20 +12368,21 @@ function checkImage(paint, drawImage, ui, canvas, renderOptions) {
12260
12368
  }
12261
12369
  }
12262
12370
 
12263
- function drawImage(paint, _imageScaleX, _imageScaleY, ui, canvas, _renderOptions) {
12264
- const {data: data, image: image} = paint, {blendMode: blendMode} = paint.originPaint, {opacity: opacity, transform: transform} = data, view = image.getFull(data.filters), u = ui.__;
12265
- let {width: width, height: height} = image, clipUI;
12266
- if ((clipUI = transform && !transform.onlyScale || u.path || u.cornerRadius) || opacity || blendMode) {
12371
+ function drawImage(paint, imageScaleX, imageScaleY, ui, canvas, _renderOptions) {
12372
+ const {data: data, image: image, complex: complex} = paint;
12373
+ let {width: width, height: height} = image;
12374
+ if (complex) {
12375
+ const {blendMode: blendMode, opacity: opacity} = paint.originPaint, {transform: transform} = data;
12267
12376
  canvas.save();
12268
- clipUI && canvas.clipUI(ui);
12377
+ complex === 2 && canvas.clipUI(ui);
12269
12378
  blendMode && (canvas.blendMode = blendMode);
12270
12379
  opacity && (canvas.opacity *= opacity);
12271
12380
  transform && canvas.transform(transform);
12272
- canvas.drawImage(view, 0, 0, width, height);
12381
+ image.render(canvas, 0, 0, width, height, ui, paint, imageScaleX, imageScaleY);
12273
12382
  canvas.restore();
12274
12383
  } else {
12275
12384
  if (data.scaleX) width *= data.scaleX, height *= data.scaleY;
12276
- canvas.drawImage(view, 0, 0, width, height);
12385
+ image.render(canvas, 0, 0, width, height, ui, paint, imageScaleX, imageScaleY);
12277
12386
  }
12278
12387
  }
12279
12388
 
@@ -12303,6 +12412,7 @@ function recycleImage(attrName, data) {
12303
12412
  if (!recycleMap) recycleMap = {};
12304
12413
  recycleMap[url] = true;
12305
12414
  ImageManager.recyclePaint(paint);
12415
+ if (data.__willDestroy && image.parent) PaintImage.recycleFilter(image, data.__leaf);
12306
12416
  if (image.loading) {
12307
12417
  if (!input) {
12308
12418
  input = data.__input && data.__input[attrName] || [];
@@ -13224,4 +13334,4 @@ try {
13224
13334
  if (wx) useCanvas("miniapp", wx);
13225
13335
  } catch (_a) {}
13226
13336
 
13227
- export { AlignHelper, Answer, App, AroundHelper, AutoBounds, BezierHelper, Bounds, BoundsEvent, BoundsHelper, Box, BoxData, Branch, BranchHelper, BranchRender, Canvas, CanvasData, CanvasManager, ChildEvent, ColorConvert, Creator, Cursor, DataHelper, Debug, Direction4, Direction9, DragBoundsHelper, DragEvent, Dragger, DropEvent, Effect, Ellipse, EllipseData, EllipseHelper, Event, EventCreator, Eventer, Export, FileHelper, Filter, FourNumberHelper, Frame, FrameData, Group, GroupData, HitCanvasManager, Image, ImageData, ImageEvent, ImageManager, IncrementId, Interaction, InteractionBase, InteractionHelper, KeyEvent, Keyboard, LayoutEvent, Layouter, Leaf, LeafBounds, LeafBoundsHelper, LeafData, LeafDataProxy, LeafEventer, LeafHelper, LeafLayout, LeafLevelList, LeafList, LeafMatrix, LeafRender, Leafer, LeaferCanvas, LeaferCanvasBase, LeaferData, LeaferEvent, LeaferImage, Line, LineData, MathHelper, Matrix, MatrixHelper, MoveEvent, MyDragEvent, MyImage, MyPointerEvent, MyTouchEvent, NeedConvertToCanvasCommandMap, OneRadian, PI2, PI_2, Paint, PaintGradient, PaintImage, Path, PathArrow, PathBounds, PathCommandDataHelper, PathCommandMap, PathCommandNodeHelper, PathConvert, PathCorner, PathCreator, PathData, PathDrawer, PathHelper, PathNodeHandleType, PathNumberCommandLengthMap, PathNumberCommandMap, Pen, PenData, Picker, Platform, Plugin, Point, PointHelper, PointerButton, PointerEvent, Polygon, PolygonData, PropertyEvent, Rect, RectData, RectHelper, RectRender, RenderEvent, Renderer, ResizeEvent, Resource, RotateEvent, Run, Selector, Star, StarData, State, StringNumberMap, SwipeEvent, TaskItem, TaskProcessor, Text, TextConvert, TextData, TouchEvent, Transition, TwoPointBoundsHelper, UI, UIBounds, UICreator, UIData, UIEvent, UIRender, UnitConvert, UnitConvertHelper, WaitHelper, WatchEvent, Watcher, ZoomEvent, affectRenderBoundsType, affectStrokeBoundsType, attr, autoLayoutType, boundsType, canvasPatch, canvasSizeAttrs, createAttr, createDescriptor, cursorType, dataProcessor, dataType, decorateLeafAttr, defineDataProcessor, defineKey, defineLeafAttr, dimType, doBoundsType, doStrokeType, effectType, emptyData, eraserType, extraPropertyEventMap, getBoundsData, getDescriptor, getMatrixData, getPointData, hitType, isArray, isData, isEmptyData, isFinite, isNull, isNumber, isObject, isString, isUndefined, layoutProcessor, leaferTransformAttrMap, maskType, naturalBoundsType, opacityType, path, pathInputType, pathType, pen, positionType, registerUI, registerUIEvent, resizeType, rewrite, rewriteAble, rotationType, scaleType, scrollType, sortType, strokeType, surfaceType, tempBounds$2 as tempBounds, tempMatrix$2 as tempMatrix, tempPoint$3 as tempPoint, tryToNumber, useCanvas, useModule, version, visibleType, zoomLayerType };
13337
+ export { AlignHelper, Answer, App, AroundHelper, AutoBounds, BezierHelper, Bounds, BoundsEvent, BoundsHelper, Box, BoxData, Branch, BranchHelper, BranchRender, Canvas, CanvasData, CanvasManager, ChildEvent, ColorConvert, Creator, Cursor, DataHelper, Debug, Direction4, Direction9, DragBoundsHelper, DragEvent, Dragger, DropEvent, Effect, Ellipse, EllipseData, EllipseHelper, Event, EventCreator, Eventer, Export, FileHelper, Filter, FourNumberHelper, Frame, FrameData, Group, GroupData, HitCanvasManager, Image, ImageData, ImageEvent, ImageManager, IncrementId, Interaction, InteractionBase, InteractionHelper, KeyEvent, Keyboard, LayoutEvent, Layouter, Leaf, LeafBounds, LeafBoundsHelper, LeafData, LeafDataProxy, LeafEventer, LeafHelper, LeafLayout, LeafLevelList, LeafList, LeafMatrix, LeafRender, Leafer, LeaferCanvas, LeaferCanvasBase, LeaferData, LeaferEvent, LeaferFilm, LeaferImage, LeaferVideo, Line, LineData, MathHelper, Matrix, MatrixHelper, MoveEvent, MyDragEvent, MyImage, MyPointerEvent, MyTouchEvent, NeedConvertToCanvasCommandMap, OneRadian, PI2, PI_2, Paint, PaintGradient, PaintImage, Path, PathArrow, PathBounds, PathCommandDataHelper, PathCommandMap, PathCommandNodeHelper, PathConvert, PathCorner, PathCreator, PathData, PathDrawer, PathHelper, PathNodeHandleType, PathNumberCommandLengthMap, PathNumberCommandMap, Pen, PenData, Picker, Platform, Plugin, Point, PointHelper, PointerButton, PointerEvent, Polygon, PolygonData, PropertyEvent, Rect, RectData, RectHelper, RectRender, RenderEvent, Renderer, ResizeEvent, Resource, RotateEvent, Run, Selector, Star, StarData, State, StringNumberMap, SwipeEvent, TaskItem, TaskProcessor, Text, TextConvert, TextData, TouchEvent, Transition, TwoPointBoundsHelper, UI, UIBounds, UICreator, UIData, UIEvent, UIRender, UnitConvert, UnitConvertHelper, WaitHelper, WatchEvent, Watcher, ZoomEvent, affectRenderBoundsType, affectStrokeBoundsType, attr, autoLayoutType, boundsType, canvasPatch, canvasSizeAttrs, createAttr, createDescriptor, cursorType, dataProcessor, dataType, decorateLeafAttr, defineDataProcessor, defineKey, defineLeafAttr, dimType, doBoundsType, doStrokeType, effectType, emptyData, eraserType, extraPropertyEventMap, getBoundsData, getDescriptor, getMatrixData, getPointData, hitType, isArray, isData, isEmptyData, isFinite, isNull, isNumber, isObject, isString, isUndefined, layoutProcessor, leaferTransformAttrMap, maskType, naturalBoundsType, opacityType, path, pathInputType, pathType, pen, positionType, registerUI, registerUIEvent, resizeType, rewrite, rewriteAble, rotationType, scaleType, scrollType, sortType, strokeType, surfaceType, tempBounds$2 as tempBounds, tempMatrix$2 as tempMatrix, tempPoint$3 as tempPoint, tryToNumber, useCanvas, useModule, version, visibleType, zoomLayerType };