@leafer-draw/worker 2.0.2 → 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.
@@ -252,6 +252,7 @@ class LeafData {
252
252
  }
253
253
  destroy() {
254
254
  this.__input = this.__middle = null;
255
+ if (this.__complexData) this.__complexData.destroy();
255
256
  }
256
257
  }
257
258
 
@@ -350,6 +351,8 @@ const {set: set$2, get: get$5, setTemp: setTemp, toTempAB: toTempAB} = FourNumbe
350
351
 
351
352
  const {round: round$3, pow: pow$1, max: max$3, floor: floor$2, PI: PI$3} = Math;
352
353
 
354
+ const tempScaleData$1 = {};
355
+
353
356
  const MathHelper = {
354
357
  within(value, min, max) {
355
358
  if (isObject(min)) max = min.max, min = min.min;
@@ -393,6 +396,24 @@ const MathHelper = {
393
396
  } else if (scale) MathHelper.assignScale(scaleData, scale);
394
397
  return scaleData;
395
398
  },
399
+ getScaleFixedData(worldScaleData, scaleFixed, unscale, abs, _localScaleData) {
400
+ let {scaleX: scaleX, scaleY: scaleY} = worldScaleData;
401
+ if (abs || scaleFixed) scaleX < 0 && (scaleX = -scaleX), scaleY < 0 && (scaleY = -scaleY);
402
+ if (scaleFixed) {
403
+ if (scaleFixed === true) {
404
+ scaleX = scaleY = unscale ? 1 : 1 / scaleX;
405
+ } else {
406
+ let minScale;
407
+ if (isNumber(scaleFixed)) minScale = scaleFixed; else if (scaleFixed === "zoom-in") minScale = 1;
408
+ if (minScale) {
409
+ if (scaleX > minScale || scaleY > minScale) scaleX = scaleY = unscale ? 1 : 1 / scaleX; else scaleX = scaleY = unscale ? 1 : 1 / minScale;
410
+ }
411
+ }
412
+ }
413
+ tempScaleData$1.scaleX = scaleX;
414
+ tempScaleData$1.scaleY = scaleY;
415
+ return tempScaleData$1;
416
+ },
396
417
  assignScale(scaleData, scale) {
397
418
  if (isNumber(scale)) {
398
419
  scaleData.scaleX = scaleData.scaleY = scale;
@@ -889,8 +910,8 @@ const PointHelper = {
889
910
  if (isObject(originPoints[0])) points = [], originPoints.forEach(p => points.push(p.x, p.y));
890
911
  return points;
891
912
  },
892
- isSame(t, point) {
893
- return float$1(t.x) === float$1(point.x) && float$1(t.y) === float$1(point.y);
913
+ isSame(t, point, quick) {
914
+ return quick ? t.x === point.x && t.y === point.y : float$1(t.x) === float$1(point.x) && float$1(t.y) === float$1(point.y);
894
915
  },
895
916
  reset(t) {
896
917
  P$5.reset(t);
@@ -965,8 +986,8 @@ class Point {
965
986
  getAtan2(to) {
966
987
  return PointHelper.getAtan2(this, to);
967
988
  }
968
- isSame(point) {
969
- return PointHelper.isSame(this, point);
989
+ isSame(point, quick) {
990
+ return PointHelper.isSame(this, point, quick);
970
991
  }
971
992
  reset() {
972
993
  PointHelper.reset(this);
@@ -1222,9 +1243,9 @@ const AroundHelper = {
1222
1243
  }
1223
1244
  if (!onlyBoxSize) to.x += box.x, to.y += box.y;
1224
1245
  },
1225
- getPoint(around, box, to) {
1246
+ getPoint(around, box, to, onlyBoxSize = true) {
1226
1247
  if (!to) to = {};
1227
- AroundHelper.toPoint(around, box, to, true);
1248
+ AroundHelper.toPoint(around, box, to, onlyBoxSize);
1228
1249
  return to;
1229
1250
  }
1230
1251
  };
@@ -1491,6 +1512,9 @@ const BoundsHelper = {
1491
1512
  y: y + height
1492
1513
  } ];
1493
1514
  },
1515
+ getPoint(t, around, onlyBoxSize = false, to) {
1516
+ return AroundHelper.getPoint(around, t, to, onlyBoxSize);
1517
+ },
1494
1518
  hitRadiusPoint(t, point, pointMatrix) {
1495
1519
  if (pointMatrix) point = PointHelper.tempToInnerRadiusPointOf(point, pointMatrix);
1496
1520
  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);
@@ -1662,6 +1686,9 @@ class Bounds {
1662
1686
  getPoints() {
1663
1687
  return BoundsHelper.getPoints(this);
1664
1688
  }
1689
+ getPoint(around, onlyBoxSize, to) {
1690
+ return BoundsHelper.getPoint(this, around, onlyBoxSize, to);
1691
+ }
1665
1692
  hitPoint(point, pointMatrix) {
1666
1693
  return BoundsHelper.hitPoint(this, point, pointMatrix);
1667
1694
  }
@@ -4102,6 +4129,7 @@ const ImageManager = {
4102
4129
  return image;
4103
4130
  },
4104
4131
  recycle(image) {
4132
+ if (image.parent) image = image.parent;
4105
4133
  image.use--;
4106
4134
  setTimeout(() => {
4107
4135
  if (!image.use) {
@@ -4270,8 +4298,10 @@ class LeaferImage {
4270
4298
  return undefined;
4271
4299
  }
4272
4300
  clearLevels(_checkUse) {}
4301
+ destroyFilter() {}
4273
4302
  destroy() {
4274
4303
  this.clearLevels();
4304
+ this.destroyFilter();
4275
4305
  const {view: view} = this;
4276
4306
  if (view && view.close) view.close();
4277
4307
  this.config = {
@@ -4468,7 +4498,6 @@ function dimType(defaultValue) {
4468
4498
  if (this.__setAttr(key, value)) {
4469
4499
  const data = this.__;
4470
4500
  DataHelper.stintSet(data, "__useDim", data.dim || data.bright || data.dimskip);
4471
- this.__layout.surfaceChange();
4472
4501
  }
4473
4502
  }
4474
4503
  }));
@@ -4518,7 +4547,6 @@ function sortType(defaultValue) {
4518
4547
  return decorateLeafAttr(defaultValue, key => attr({
4519
4548
  set(value) {
4520
4549
  if (this.__setAttr(key, value)) {
4521
- this.__layout.surfaceChange();
4522
4550
  this.waitParent(() => {
4523
4551
  this.parent.__layout.childrenSortChange();
4524
4552
  });
@@ -4555,7 +4583,6 @@ function hitType(defaultValue) {
4555
4583
  set(value) {
4556
4584
  if (this.__setAttr(key, value)) {
4557
4585
  this.__layout.hitCanvasChanged = true;
4558
- if (Debug.showBounds === "hit") this.__layout.surfaceChange();
4559
4586
  if (this.leafer) this.leafer.updateCursor();
4560
4587
  }
4561
4588
  }
@@ -4761,6 +4788,10 @@ const LeafHelper = {
4761
4788
  if (layout.stateStyleChanged) leaf.updateState();
4762
4789
  if (layout.opacityChanged) updateAllWorldOpacity(leaf);
4763
4790
  leaf.__updateChange();
4791
+ if (layout.surfaceChanged) {
4792
+ if (leaf.__hasComplex) L.updateComplex(leaf);
4793
+ layout.surfaceChanged = false;
4794
+ }
4764
4795
  },
4765
4796
  updateAllChange(leaf) {
4766
4797
  updateChange$1(leaf);
@@ -4785,6 +4816,9 @@ const LeafHelper = {
4785
4816
  if (!fromWorld) fromWorld = leaf.__nowWorld;
4786
4817
  if (leaf.__worldFlipped || Platform.fullImageShadow) currentCanvas.copyWorldByReset(fromCanvas, fromWorld, leaf.__nowWorld, blendMode, onlyResetTransform); else currentCanvas.copyWorldToInner(fromCanvas, fromWorld, leaf.__layout.renderBounds, blendMode);
4787
4818
  },
4819
+ renderComplex(_leaf, _canvas, _options) {},
4820
+ updateComplex(_leaf) {},
4821
+ checkComplex(_leaf) {},
4788
4822
  moveWorld(t, x, y = 0, isInnerPoint, transition) {
4789
4823
  const local = isObject(x) ? Object.assign({}, x) : {
4790
4824
  x: x,
@@ -4896,6 +4930,9 @@ const LeafHelper = {
4896
4930
  divideParent(matrix, relative.scrollWorldTransform);
4897
4931
  return temp ? matrix : Object.assign({}, matrix);
4898
4932
  },
4933
+ updateScaleFixedWorld(_t) {},
4934
+ updateOuterBounds(_t) {},
4935
+ cacheId(_t) {},
4899
4936
  drop(t, parent, index, resize) {
4900
4937
  t.setTransform(L.getRelativeWorld(t, parent, true), resize);
4901
4938
  parent.add(t, index);
@@ -4946,7 +4983,8 @@ const LeafBoundsHelper = {
4946
4983
  return target.__.eraser || target.__.visible === 0 ? null : target.__layout.localStrokeBounds;
4947
4984
  },
4948
4985
  localRenderBounds(target) {
4949
- 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;
4950
4988
  },
4951
4989
  maskLocalBoxBounds(target, index) {
4952
4990
  return checkMask(target, index) && target.__localBoxBounds;
@@ -4955,7 +4993,8 @@ const LeafBoundsHelper = {
4955
4993
  return checkMask(target, index) && target.__layout.localStrokeBounds;
4956
4994
  },
4957
4995
  maskLocalRenderBounds(target, index) {
4958
- return checkMask(target, index) && target.__layout.localRenderBounds;
4996
+ const {__layout: __layout} = target;
4997
+ return checkMask(target, index) && (__layout.localOuterBounds || __layout.localRenderBounds);
4959
4998
  },
4960
4999
  excludeRenderBounds(child, options) {
4961
5000
  if (options.bounds && !options.bounds.hit(child.__world, options.matrix)) return true;
@@ -5475,7 +5514,6 @@ class LeafLayout {
5475
5514
  }
5476
5515
  opacityChange() {
5477
5516
  this.opacityChanged = true;
5478
- this.surfaceChanged || this.surfaceChange();
5479
5517
  }
5480
5518
  childrenSortChange() {
5481
5519
  if (!this.childrenSortChanged) {
@@ -5968,6 +6006,7 @@ const LeafMatrix = {
5968
6006
  const {parent: parent, __layout: __layout, __world: __world, __scrollWorld: __scrollWorld, __: __} = this;
5969
6007
  multiplyParent$2(this.__local || __layout, parent ? parent.__scrollWorld || parent.__world : defaultWorld, __world, !!__layout.affectScaleOrRotation, __);
5970
6008
  if (__scrollWorld) translateInner(Object.assign(__scrollWorld, __world), __.scrollX, __.scrollY);
6009
+ if (__layout.scaleFixed) LeafHelper.updateScaleFixedWorld(this);
5971
6010
  },
5972
6011
  __updateLocalMatrix() {
5973
6012
  if (this.__local) {
@@ -6001,6 +6040,7 @@ const LeafBounds = {
6001
6040
  __updateWorldBounds() {
6002
6041
  const {__layout: __layout, __world: __world} = this;
6003
6042
  toOuterOf$2(__layout.renderBounds, __world, __world);
6043
+ if (this.__hasComplex) LeafHelper.checkComplex(this);
6004
6044
  if (__layout.resized) {
6005
6045
  if (__layout.resized === "inner") this.__onUpdateSize();
6006
6046
  if (this.__hasLocalEvent) BoundsEvent.emitLocal(this);
@@ -6050,6 +6090,7 @@ const LeafBounds = {
6050
6090
  layout.renderChanged = undefined;
6051
6091
  if (this.parent) this.parent.__layout.renderChange();
6052
6092
  }
6093
+ if (layout.outerScale) LeafHelper.updateOuterBounds(this);
6053
6094
  layout.resized || (layout.resized = "local");
6054
6095
  layout.boundsChanged = undefined;
6055
6096
  },
@@ -6116,7 +6157,7 @@ const LeafRender = {
6116
6157
  const data = this.__;
6117
6158
  if (data.bright && !options.topRendering) return options.topList.add(this);
6118
6159
  canvas.setWorld(this.__nowWorld = this.__getNowWorld(options));
6119
- 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;
6120
6161
  if (this.__.__single) {
6121
6162
  if (data.eraser === "path") return this.__renderEraser(canvas, options);
6122
6163
  const tempCanvas = canvas.getSameCanvas(true, true);
@@ -6170,7 +6211,7 @@ const BranchRender = {
6170
6211
  if (data.eraser === "path") return this.__renderEraser(canvas, options);
6171
6212
  const tempCanvas = canvas.getSameCanvas(false, true);
6172
6213
  this.__renderBranch(tempCanvas, options);
6173
- canvas.opacity = options.dimOpacity ? data.opacity * options.dimOpacity : data.opacity;
6214
+ canvas.opacity = options.ignoreOpacity ? 1 : options.dimOpacity ? data.opacity * options.dimOpacity : data.opacity;
6174
6215
  canvas.copyWorldByReset(tempCanvas, nowWorld, nowWorld, data.__blendMode, true);
6175
6216
  tempCanvas.recycle(nowWorld);
6176
6217
  } else {
@@ -6186,7 +6227,7 @@ const BranchRender = {
6186
6227
  const {children: children} = this;
6187
6228
  for (let i = 0, len = children.length; i < len; i++) {
6188
6229
  child = children[i];
6189
- excludeRenderBounds$1(child, options) || (child.__.complex ? child.__renderComplex(canvas, options) : child.__render(canvas, options));
6230
+ excludeRenderBounds$1(child, options) || (child.__hasComplex ? LeafHelper.renderComplex(child, canvas, options) : child.__render(canvas, options));
6190
6231
  }
6191
6232
  }
6192
6233
  },
@@ -6200,8 +6241,6 @@ const BranchRender = {
6200
6241
  }
6201
6242
  };
6202
6243
 
6203
- const tempScaleData$1 = {};
6204
-
6205
6244
  const {LEAF: LEAF, create: create} = IncrementId;
6206
6245
 
6207
6246
  const {stintSet: stintSet$4} = DataHelper;
@@ -6212,6 +6251,8 @@ const {toOuterOf: toOuterOf$1} = BoundsHelper;
6212
6251
 
6213
6252
  const {copy: copy$2, move: move$2} = PointHelper;
6214
6253
 
6254
+ const {getScaleFixedData: getScaleFixedData} = MathHelper;
6255
+
6215
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;
6216
6257
 
6217
6258
  let Leaf = class Leaf {
@@ -6370,6 +6411,7 @@ let Leaf = class Leaf {
6370
6411
  this.__level = this.parent ? this.parent.__level + 1 : 1;
6371
6412
  if (this.animation) this.__runAnimation("in");
6372
6413
  if (this.__bubbleMap) this.__emitLifeEvent(ChildEvent.MOUNTED);
6414
+ if (leafer.cacheId) LeafHelper.cacheId(this);
6373
6415
  } else {
6374
6416
  this.__emitLifeEvent(ChildEvent.UNMOUNTED);
6375
6417
  }
@@ -6499,13 +6541,8 @@ let Leaf = class Leaf {
6499
6541
  if (scaleX < 0) scaleX = -scaleX;
6500
6542
  return scaleX > 1 ? scaleX : 1;
6501
6543
  }
6502
- getRenderScaleData(abs, scaleFixed) {
6503
- let {scaleX: scaleX, scaleY: scaleY} = ImageManager.patternLocked ? this.__world : this.__nowWorld;
6504
- if (abs) scaleX < 0 && (scaleX = -scaleX), scaleY < 0 && (scaleY = -scaleY);
6505
- if (scaleFixed === true || scaleFixed === "zoom-in" && scaleX > 1 && scaleY > 1) scaleX = scaleY = 1;
6506
- tempScaleData$1.scaleX = scaleX;
6507
- tempScaleData$1.scaleY = scaleY;
6508
- return tempScaleData$1;
6544
+ getRenderScaleData(abs, scaleFixed, unscale = true) {
6545
+ return getScaleFixedData(ImageManager.patternLocked ? this.__world : this.__nowWorld || this.__world, scaleFixed, unscale, abs);
6509
6546
  }
6510
6547
  getTransform(relative) {
6511
6548
  return this.__layout.getTransform(relative || "local");
@@ -6667,7 +6704,6 @@ let Leaf = class Leaf {
6667
6704
  __drawHitPath(_canvas) {}
6668
6705
  __updateHitCanvas() {}
6669
6706
  __render(_canvas, _options) {}
6670
- __renderComplex(_canvas, _options) {}
6671
6707
  __drawFast(_canvas, _options) {}
6672
6708
  __draw(_canvas, _options, _originCanvas) {}
6673
6709
  __clip(_canvas, _options) {}
@@ -6678,7 +6714,7 @@ let Leaf = class Leaf {
6678
6714
  __drawPath(_canvas) {}
6679
6715
  __drawRenderPath(_canvas) {}
6680
6716
  __updatePath() {}
6681
- __updateRenderPath() {}
6717
+ __updateRenderPath(_updateCache) {}
6682
6718
  getMotionPathData() {
6683
6719
  return Plugin.need("path");
6684
6720
  }
@@ -6752,9 +6788,11 @@ let Branch = class Branch extends Leaf {
6752
6788
  return 0;
6753
6789
  }
6754
6790
  __updateRenderSpread() {
6791
+ let layout;
6755
6792
  const {children: children} = this;
6756
6793
  for (let i = 0, len = children.length; i < len; i++) {
6757
- if (children[i].__layout.renderSpread) return 1;
6794
+ layout = children[i].__layout;
6795
+ if (layout.renderSpread || layout.localOuterBounds) return 1;
6758
6796
  }
6759
6797
  return 0;
6760
6798
  }
@@ -7013,7 +7051,7 @@ class LeafLevelList {
7013
7051
  }
7014
7052
  }
7015
7053
 
7016
- const version = "2.0.2";
7054
+ const version = "2.0.3";
7017
7055
 
7018
7056
  class LeaferCanvas extends LeaferCanvasBase {
7019
7057
  get allowBackgroundColor() {
@@ -7694,7 +7732,9 @@ function effectType(defaultValue) {
7694
7732
  set(value) {
7695
7733
  this.__setAttr(key, value);
7696
7734
  if (value) this.__.__useEffect = true;
7697
- this.__layout.renderChanged || this.__layout.renderChange();
7735
+ const layout = this.__layout;
7736
+ layout.renderChanged || layout.renderChange();
7737
+ layout.surfaceChange();
7698
7738
  }
7699
7739
  }));
7700
7740
  }
@@ -7908,15 +7948,16 @@ class UIData extends LeafData {
7908
7948
  this.__needComputePaint = undefined;
7909
7949
  }
7910
7950
  __getRealStrokeWidth(childStyle) {
7911
- let {strokeWidth: strokeWidth, strokeWidthFixed: strokeWidthFixed} = this;
7951
+ let {strokeWidth: strokeWidth, strokeScaleFixed: strokeScaleFixed} = this;
7912
7952
  if (childStyle) {
7913
7953
  if (childStyle.strokeWidth) strokeWidth = childStyle.strokeWidth;
7914
- if (!isUndefined(childStyle.strokeWidthFixed)) strokeWidthFixed = childStyle.strokeWidthFixed;
7954
+ if (!isUndefined(childStyle.strokeScaleFixed)) strokeScaleFixed = childStyle.strokeScaleFixed;
7955
+ }
7956
+ if (strokeScaleFixed) {
7957
+ const {scaleX: scaleX} = this.__leaf.getRenderScaleData(true, strokeScaleFixed, false);
7958
+ if (scaleX !== 1) return strokeWidth * scaleX;
7915
7959
  }
7916
- if (strokeWidthFixed) {
7917
- const scale = this.__leaf.getClampRenderScale();
7918
- return scale > 1 ? strokeWidth / scale : strokeWidth;
7919
- } else return strokeWidth;
7960
+ return strokeWidth;
7920
7961
  }
7921
7962
  __setPaint(attrName, value) {
7922
7963
  this.__setInput(attrName, value);
@@ -8102,7 +8143,7 @@ const UIBounds = {
8102
8143
  const data = this.__, {strokeAlign: strokeAlign, __maxStrokeWidth: strokeWidth} = data, box = this.__box;
8103
8144
  if ((data.stroke || data.hitStroke === "all") && strokeWidth && strokeAlign !== "inside") {
8104
8145
  boxSpread = spread = strokeAlign === "center" ? strokeWidth / 2 : strokeWidth;
8105
- if (!data.__boxStroke) {
8146
+ if (!data.__boxStroke || data.__useArrow) {
8106
8147
  const miterLimitAddWidth = data.__isLinePath ? 0 : 10 * spread;
8107
8148
  const storkeCapAddWidth = data.strokeCap === "none" ? 0 : strokeWidth;
8108
8149
  spread += Math.max(miterLimitAddWidth, storkeCapAddWidth);
@@ -8259,6 +8300,12 @@ let UI = UI_1 = class UI extends Leaf {
8259
8300
  get isFrame() {
8260
8301
  return false;
8261
8302
  }
8303
+ set strokeWidthFixed(value) {
8304
+ this.strokeScaleFixed = value;
8305
+ }
8306
+ get strokeWidthFixed() {
8307
+ return this.strokeScaleFixed;
8308
+ }
8262
8309
  set scale(value) {
8263
8310
  MathHelper.assignScale(this, value);
8264
8311
  }
@@ -8314,6 +8361,9 @@ let UI = UI_1 = class UI extends Leaf {
8314
8361
  getPathString(curve, pathForRender, floatLength) {
8315
8362
  return PathConvert.stringify(this.getPath(curve, pathForRender), floatLength);
8316
8363
  }
8364
+ asPath(curve, pathForRender) {
8365
+ this.path = this.getPath(curve, pathForRender);
8366
+ }
8317
8367
  load() {
8318
8368
  this.__.__computePaint();
8319
8369
  }
@@ -8323,16 +8373,18 @@ let UI = UI_1 = class UI extends Leaf {
8323
8373
  data.lazy && !this.__inLazyBounds && !Export.running ? data.__needComputePaint = true : data.__computePaint();
8324
8374
  }
8325
8375
  }
8326
- __updateRenderPath() {
8376
+ __updateRenderPath(updateCache) {
8327
8377
  const data = this.__;
8328
8378
  if (data.path) {
8329
8379
  data.__pathForRender = data.cornerRadius ? PathCorner.smooth(data.path, data.cornerRadius, data.cornerSmoothing) : data.path;
8330
- if (data.__useArrow) PathArrow.addArrows(this);
8380
+ if (data.__useArrow) PathArrow.addArrows(this, updateCache);
8331
8381
  } else data.__pathForRender && (data.__pathForRender = undefined);
8332
8382
  }
8333
8383
  __drawRenderPath(canvas) {
8384
+ const data = this.__;
8334
8385
  canvas.beginPath();
8335
- this.__drawPathByData(canvas, this.__.__pathForRender);
8386
+ if (data.__useArrow) PathArrow.updateArrow(this);
8387
+ this.__drawPathByData(canvas, data.__pathForRender);
8336
8388
  }
8337
8389
  __drawPath(canvas) {
8338
8390
  canvas.beginPath();
@@ -8381,6 +8433,7 @@ let UI = UI_1 = class UI extends Leaf {
8381
8433
  static setEditOuter(_toolName) {}
8382
8434
  static setEditInner(_editorName) {}
8383
8435
  destroy() {
8436
+ this.__.__willDestroy = true;
8384
8437
  this.fill = this.stroke = null;
8385
8438
  if (this.__animate) this.killAnimate();
8386
8439
  super.destroy();
@@ -8497,7 +8550,7 @@ __decorate([ strokeType("inside") ], UI.prototype, "strokeAlign", void 0);
8497
8550
 
8498
8551
  __decorate([ strokeType(1, true) ], UI.prototype, "strokeWidth", void 0);
8499
8552
 
8500
- __decorate([ strokeType(false) ], UI.prototype, "strokeWidthFixed", void 0);
8553
+ __decorate([ strokeType(false) ], UI.prototype, "strokeScaleFixed", void 0);
8501
8554
 
8502
8555
  __decorate([ strokeType("none") ], UI.prototype, "strokeCap", void 0);
8503
8556
 
@@ -9129,9 +9182,9 @@ let Ellipse = class Ellipse extends UI {
9129
9182
  return "Ellipse";
9130
9183
  }
9131
9184
  __updatePath() {
9132
- const {width: width, height: height, innerRadius: innerRadius, startAngle: startAngle, endAngle: endAngle} = this.__;
9185
+ const data = this.__, {width: width, height: height, innerRadius: innerRadius, startAngle: startAngle, endAngle: endAngle} = data;
9133
9186
  const rx = width / 2, ry = height / 2;
9134
- const path = this.__.path = [];
9187
+ const path = data.path = [];
9135
9188
  let open;
9136
9189
  if (innerRadius) {
9137
9190
  if (startAngle || endAngle) {
@@ -9153,7 +9206,7 @@ let Ellipse = class Ellipse extends UI {
9153
9206
  }
9154
9207
  }
9155
9208
  if (!open) closePath$2(path);
9156
- if (Platform.ellipseToCurve) this.__.path = this.getPath(true);
9209
+ if (Platform.ellipseToCurve || data.__useArrow) data.path = this.getPath(true);
9157
9210
  }
9158
9211
  };
9159
9212
 
@@ -9628,8 +9681,8 @@ function fills(fills, ui, canvas, renderOptions) {
9628
9681
  canvas.save();
9629
9682
  if (item.transform) canvas.transform(item.transform);
9630
9683
  if (originPaint.scaleFixed) {
9631
- const {scaleX: scaleX, scaleY: scaleY} = ui.getRenderScaleData(true);
9632
- if (originPaint.scaleFixed === true || originPaint.scaleFixed === "zoom-in" && scaleX > 1 && scaleY > 1) canvas.scale(1 / scaleX, 1 / scaleY);
9684
+ const {scaleX: scaleX, scaleY: scaleY} = ui.getRenderScaleData(true, originPaint.scaleFixed, false);
9685
+ if (scaleX !== 1) canvas.scale(scaleX, scaleY);
9633
9686
  }
9634
9687
  if (originPaint.blendMode) canvas.blendMode = originPaint.blendMode;
9635
9688
  fillPathOrText(ui, canvas, renderOptions);
@@ -10050,6 +10103,7 @@ function checkSizeAndCreateData(ui, attrName, paint, image, leafPaint, boxBounds
10050
10103
  const clip = transform && !transform.onlyScale || data.path || data.cornerRadius;
10051
10104
  if (clip || opacity && opacity < 1 || blendMode) leafPaint.complex = clip ? 2 : true;
10052
10105
  }
10106
+ if (paint.filter) PaintImage.applyFilter(leafPaint, image, paint.filter, ui);
10053
10107
  return true;
10054
10108
  }
10055
10109
 
@@ -10277,7 +10331,7 @@ function createPattern(paint, ui, canvas, renderOptions) {
10277
10331
  let {scaleX: scaleX, scaleY: scaleY} = PaintImage.getImageRenderScaleData(paint, ui, canvas, renderOptions), id = paint.film ? paint.nowIndex : scaleX + "-" + scaleY;
10278
10332
  if (paint.patternId !== id && !ui.destroyed) {
10279
10333
  if (!(Platform.image.isLarge(paint.image, scaleX, scaleY) && !paint.data.repeat)) {
10280
- const {image: image, data: data} = paint, {opacity: opacity, filters: filters} = paint.originPaint, {transform: transform, gap: gap} = data, fixScale = PaintImage.getPatternFixScale(paint, scaleX, scaleY);
10334
+ const {image: image, data: data} = paint, {opacity: opacity} = paint.originPaint, {transform: transform, gap: gap} = data, fixScale = PaintImage.getPatternFixScale(paint, scaleX, scaleY);
10281
10335
  let imageMatrix, xGap, yGap, {width: width, height: height} = image;
10282
10336
  if (fixScale) scaleX *= fixScale, scaleY *= fixScale;
10283
10337
  width *= scaleX;
@@ -10293,7 +10347,7 @@ function createPattern(paint, ui, canvas, renderOptions) {
10293
10347
  if (transform) copy$1(imageMatrix, transform);
10294
10348
  scale(imageMatrix, 1 / scaleX, 1 / scaleY);
10295
10349
  }
10296
- const imageCanvas = image.getCanvas(width, height, opacity, filters, xGap, yGap, ui.leafer && ui.leafer.config.smooth, data.interlace);
10350
+ const imageCanvas = image.getCanvas(width, height, opacity, undefined, xGap, yGap, ui.leafer && ui.leafer.config.smooth, data.interlace);
10297
10351
  const pattern = image.getPattern(imageCanvas, data.repeat || (Platform.origin.noRepeat || "no-repeat"), imageMatrix, paint);
10298
10352
  paint.style = pattern;
10299
10353
  paint.patternId = id;
@@ -10384,6 +10438,7 @@ function recycleImage(attrName, data) {
10384
10438
  if (!recycleMap) recycleMap = {};
10385
10439
  recycleMap[url] = true;
10386
10440
  ImageManager.recyclePaint(paint);
10441
+ if (data.__willDestroy && image.parent) PaintImage.recycleFilter(image, data.__leaf);
10387
10442
  if (image.loading) {
10388
10443
  if (!input) {
10389
10444
  input = data.__input && data.__input[attrName] || [];