@leafer-draw/miniapp 1.2.1 → 1.3.0

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.
@@ -765,8 +765,8 @@ const TwoPointBoundsHelper = {
765
765
  t.maxY = y > t.maxY ? y : t.maxY;
766
766
  },
767
767
  addBounds(t, x, y, width, height) {
768
- addPoint$4(t, x, y);
769
- addPoint$4(t, x + width, y + height);
768
+ addPoint$3(t, x, y);
769
+ addPoint$3(t, x + width, y + height);
770
770
  },
771
771
  copy(t, pb) {
772
772
  t.minX = pb.minX;
@@ -787,9 +787,9 @@ const TwoPointBoundsHelper = {
787
787
  setBounds.height = t.maxY - t.minY;
788
788
  }
789
789
  };
790
- const { addPoint: addPoint$4 } = TwoPointBoundsHelper;
790
+ const { addPoint: addPoint$3 } = TwoPointBoundsHelper;
791
791
 
792
- const { tempPointBounds: tempPointBounds$1, setPoint: setPoint$3, addPoint: addPoint$3, toBounds: toBounds$4 } = TwoPointBoundsHelper;
792
+ const { tempPointBounds: tempPointBounds$1, setPoint: setPoint$2, addPoint: addPoint$2, toBounds: toBounds$3 } = TwoPointBoundsHelper;
793
793
  const { toOuterPoint: toOuterPoint$2 } = MatrixHelper;
794
794
  const { float, fourNumber } = MathHelper;
795
795
  const { floor, ceil: ceil$2 } = Math;
@@ -905,17 +905,17 @@ const BoundsHelper = {
905
905
  point.x = t.x;
906
906
  point.y = t.y;
907
907
  toOuterPoint$2(matrix, point, toPoint$5);
908
- setPoint$3(tempPointBounds$1, toPoint$5.x, toPoint$5.y);
908
+ setPoint$2(tempPointBounds$1, toPoint$5.x, toPoint$5.y);
909
909
  point.x = t.x + t.width;
910
910
  toOuterPoint$2(matrix, point, toPoint$5);
911
- addPoint$3(tempPointBounds$1, toPoint$5.x, toPoint$5.y);
911
+ addPoint$2(tempPointBounds$1, toPoint$5.x, toPoint$5.y);
912
912
  point.y = t.y + t.height;
913
913
  toOuterPoint$2(matrix, point, toPoint$5);
914
- addPoint$3(tempPointBounds$1, toPoint$5.x, toPoint$5.y);
914
+ addPoint$2(tempPointBounds$1, toPoint$5.x, toPoint$5.y);
915
915
  point.x = t.x;
916
916
  toOuterPoint$2(matrix, point, toPoint$5);
917
- addPoint$3(tempPointBounds$1, toPoint$5.x, toPoint$5.y);
918
- toBounds$4(tempPointBounds$1, to);
917
+ addPoint$2(tempPointBounds$1, toPoint$5.x, toPoint$5.y);
918
+ toBounds$3(tempPointBounds$1, to);
919
919
  }
920
920
  },
921
921
  toInnerOf(t, matrix, to) {
@@ -1005,8 +1005,8 @@ const BoundsHelper = {
1005
1005
  B.reset(t);
1006
1006
  },
1007
1007
  setPoints(t, points) {
1008
- points.forEach((point, index) => index === 0 ? setPoint$3(tempPointBounds$1, point.x, point.y) : addPoint$3(tempPointBounds$1, point.x, point.y));
1009
- toBounds$4(tempPointBounds$1, t);
1008
+ points.forEach((point, index) => index === 0 ? setPoint$2(tempPointBounds$1, point.x, point.y) : addPoint$2(tempPointBounds$1, point.x, point.y));
1009
+ toBounds$3(tempPointBounds$1, t);
1010
1010
  },
1011
1011
  setPoint(t, point) {
1012
1012
  B.set(t, point.x, point.y);
@@ -1374,7 +1374,7 @@ function getNameList(name) {
1374
1374
  }
1375
1375
  const D$4 = Debug;
1376
1376
 
1377
- const debug$e = Debug.get('RunTime');
1377
+ const debug$d = Debug.get('RunTime');
1378
1378
  const Run = {
1379
1379
  currentId: 0,
1380
1380
  currentName: '',
@@ -1392,7 +1392,7 @@ const Run = {
1392
1392
  const time = R.idMap[id], name = R.nameMap[id];
1393
1393
  const duration = microsecond ? (performance.now() - time) / 1000 : Date.now() - time;
1394
1394
  R.idMap[id] = R.nameMap[id] = R.nameToIdMap[name] = undefined;
1395
- debug$e.log(name, duration, 'ms');
1395
+ debug$d.log(name, duration, 'ms');
1396
1396
  },
1397
1397
  endOfName(name, microsecond) {
1398
1398
  const id = R.nameToIdMap[name];
@@ -1402,34 +1402,37 @@ const Run = {
1402
1402
  };
1403
1403
  const R = Run;
1404
1404
 
1405
+ const check = [];
1405
1406
  const Plugin = {
1406
1407
  list: {},
1407
- add(name) {
1408
+ add(name, ...needPlugins) {
1408
1409
  this.list[name] = true;
1410
+ check.push(...needPlugins);
1409
1411
  },
1410
- check(name, tip) {
1412
+ has(name, tip) {
1411
1413
  const rs = this.list[name];
1412
1414
  if (!rs && tip)
1413
1415
  this.need(name);
1414
1416
  return rs;
1415
1417
  },
1416
1418
  need(name) {
1417
- console.error('need plugin: @leafer-in/' + name);
1419
+ console.error('need plugin: ' + (name.includes('-x') ? '' : '@leafer-in/') + name);
1418
1420
  }
1419
1421
  };
1422
+ setTimeout(() => check.forEach(name => Plugin.has(name, true)));
1420
1423
 
1421
- const debug$d = Debug.get('UICreator');
1424
+ const debug$c = Debug.get('UICreator');
1422
1425
  const UICreator = {
1423
1426
  list: {},
1424
1427
  register(UI) {
1425
1428
  const { __tag: tag } = UI.prototype;
1426
1429
  if (list$1[tag])
1427
- debug$d.repeat(tag);
1430
+ debug$c.repeat(tag);
1428
1431
  list$1[tag] = UI;
1429
1432
  },
1430
1433
  get(tag, data, x, y, width, height) {
1431
1434
  if (!list$1[tag])
1432
- debug$d.error('not register ' + tag);
1435
+ debug$c.error('not register ' + tag);
1433
1436
  const ui = new list$1[tag](data);
1434
1437
  if (x !== undefined) {
1435
1438
  ui.x = x;
@@ -1445,7 +1448,7 @@ const UICreator = {
1445
1448
  };
1446
1449
  const { list: list$1 } = UICreator;
1447
1450
 
1448
- const debug$c = Debug.get('EventCreator');
1451
+ const debug$b = Debug.get('EventCreator');
1449
1452
  const EventCreator = {
1450
1453
  nameList: {},
1451
1454
  register(Event) {
@@ -1453,7 +1456,7 @@ const EventCreator = {
1453
1456
  Object.keys(Event).forEach(key => {
1454
1457
  name = Event[key];
1455
1458
  if (typeof name === 'string')
1456
- nameList[name] && debug$c.repeat(name), nameList[name] = Event;
1459
+ nameList[name] && debug$b.repeat(name), nameList[name] = Event;
1457
1460
  });
1458
1461
  },
1459
1462
  changeName(oldName, newName) {
@@ -2047,11 +2050,11 @@ class LeaferCanvasBase extends Canvas$1 {
2047
2050
  toBlob(_type, _quality) { return undefined; }
2048
2051
  toDataURL(_type, _quality) { return undefined; }
2049
2052
  saveAs(_filename, _quality) { return undefined; }
2050
- resize(size) {
2053
+ resize(size, safeResize = true) {
2051
2054
  if (this.isSameSize(size))
2052
2055
  return;
2053
2056
  let takeCanvas;
2054
- if (this.context && !this.unreal && this.width) {
2057
+ if (this.context && !this.unreal && safeResize && this.width) {
2055
2058
  takeCanvas = this.getSameCanvas();
2056
2059
  takeCanvas.copyWorld(this);
2057
2060
  }
@@ -2342,7 +2345,7 @@ const RectHelper = {
2342
2345
  };
2343
2346
 
2344
2347
  const { sin: sin$3, cos: cos$3, atan2: atan2$1, ceil: ceil$1, abs: abs$3, PI: PI$2, sqrt: sqrt$1, pow } = Math;
2345
- const { setPoint: setPoint$2, addPoint: addPoint$2 } = TwoPointBoundsHelper;
2348
+ const { setPoint: setPoint$1, addPoint: addPoint$1 } = TwoPointBoundsHelper;
2346
2349
  const { set, toNumberPoints } = PointHelper;
2347
2350
  const { M: M$5, L: L$6, C: C$5, Q: Q$4, Z: Z$5 } = PathCommandMap;
2348
2351
  const tempPoint$2 = {};
@@ -2418,8 +2421,8 @@ const BezierHelper = {
2418
2421
  if (data)
2419
2422
  data.push(L$6, x1, y1);
2420
2423
  if (setPointBounds) {
2421
- setPoint$2(setPointBounds, fromX, fromY);
2422
- addPoint$2(setPointBounds, x1, y1);
2424
+ setPoint$1(setPointBounds, fromX, fromY);
2425
+ addPoint$1(setPointBounds, x1, y1);
2423
2426
  }
2424
2427
  if (setStartPoint)
2425
2428
  set(setStartPoint, fromX, fromY);
@@ -2471,7 +2474,7 @@ const BezierHelper = {
2471
2474
  if (data)
2472
2475
  data.push(data.length ? L$6 : M$5, fromX, fromY);
2473
2476
  if (setPointBounds)
2474
- setPoint$2(setPointBounds, fromX, fromY);
2477
+ setPoint$1(setPointBounds, fromX, fromY);
2475
2478
  if (setStartPoint)
2476
2479
  set(setStartPoint, fromX, fromY);
2477
2480
  for (let i = 0; i < parts; i++) {
@@ -2533,11 +2536,11 @@ const BezierHelper = {
2533
2536
  if (0 < t2 && t2 < 1)
2534
2537
  tList.push(t2);
2535
2538
  }
2536
- addMode ? addPoint$2(pointBounds, fromX, fromY) : setPoint$2(pointBounds, fromX, fromY);
2537
- addPoint$2(pointBounds, toX, toY);
2539
+ addMode ? addPoint$1(pointBounds, fromX, fromY) : setPoint$1(pointBounds, fromX, fromY);
2540
+ addPoint$1(pointBounds, toX, toY);
2538
2541
  for (let i = 0, len = tList.length; i < len; i++) {
2539
2542
  getPointAndSet(tList[i], fromX, fromY, x1, y1, x2, y2, toX, toY, tempPoint$2);
2540
- addPoint$2(pointBounds, tempPoint$2.x, tempPoint$2.y);
2543
+ addPoint$1(pointBounds, tempPoint$2.x, tempPoint$2.y);
2541
2544
  }
2542
2545
  },
2543
2546
  getPointAndSet(t, fromX, fromY, x1, y1, x2, y2, toX, toY, setPoint) {
@@ -2609,7 +2612,7 @@ const EllipseHelper = {
2609
2612
  const { M: M$4, m, L: L$5, l, H, h, V, v, C: C$4, c, S, s, Q: Q$3, q, T, t, A, a, Z: Z$4, z, N: N$3, D: D$3, X: X$3, G: G$3, F: F$4, O: O$3, P: P$3, U: U$3 } = PathCommandMap;
2610
2613
  const { rect: rect$2, roundRect: roundRect$2, arcTo: arcTo$3, arc: arc$3, ellipse: ellipse$4, quadraticCurveTo: quadraticCurveTo$1 } = BezierHelper;
2611
2614
  const { ellipticalArc } = EllipseHelper;
2612
- const debug$b = Debug.get('PathConvert');
2615
+ const debug$a = Debug.get('PathConvert');
2613
2616
  const setEndPoint$1 = {};
2614
2617
  const PathConvert = {
2615
2618
  current: { dot: 0 },
@@ -2850,7 +2853,7 @@ const PathConvert = {
2850
2853
  i += 6;
2851
2854
  break;
2852
2855
  default:
2853
- debug$b.error(`command: ${command} [index:${i}]`, old);
2856
+ debug$a.error(`command: ${command} [index:${i}]`, old);
2854
2857
  return data;
2855
2858
  }
2856
2859
  lastCommand = command;
@@ -3075,7 +3078,7 @@ class PathCreator {
3075
3078
  }
3076
3079
 
3077
3080
  const { M: M$2, L: L$3, C: C$2, Q: Q$1, Z: Z$2, N: N$1, D: D$1, X: X$1, G: G$1, F: F$2, O: O$1, P: P$1, U: U$1 } = PathCommandMap;
3078
- const debug$a = Debug.get('PathDrawer');
3081
+ const debug$9 = Debug.get('PathDrawer');
3079
3082
  const PathDrawer = {
3080
3083
  drawPathByData(drawer, data) {
3081
3084
  if (!data)
@@ -3138,7 +3141,7 @@ const PathDrawer = {
3138
3141
  i += 6;
3139
3142
  break;
3140
3143
  default:
3141
- debug$a.error(`command: ${command} [index:${i}]`, data);
3144
+ debug$9.error(`command: ${command} [index:${i}]`, data);
3142
3145
  return;
3143
3146
  }
3144
3147
  }
@@ -3147,8 +3150,8 @@ const PathDrawer = {
3147
3150
 
3148
3151
  const { M: M$1, L: L$2, C: C$1, Q, Z: Z$1, N, D, X, G, F: F$1, O, P, U } = PathCommandMap;
3149
3152
  const { toTwoPointBounds, toTwoPointBoundsByQuadraticCurve, arcTo: arcTo$1, arc, ellipse: ellipse$1 } = BezierHelper;
3150
- const { addPointBounds, copy: copy$7, addPoint: addPoint$1, setPoint: setPoint$1, addBounds, toBounds: toBounds$3 } = TwoPointBoundsHelper;
3151
- const debug$9 = Debug.get('PathBounds');
3153
+ const { addPointBounds, copy: copy$7, addPoint, setPoint, addBounds, toBounds: toBounds$2 } = TwoPointBoundsHelper;
3154
+ const debug$8 = Debug.get('PathBounds');
3152
3155
  let radius, radiusX, radiusY;
3153
3156
  const tempPointBounds = {};
3154
3157
  const setPointBounds = {};
@@ -3156,21 +3159,21 @@ const setEndPoint = {};
3156
3159
  const PathBounds = {
3157
3160
  toBounds(data, setBounds) {
3158
3161
  PathBounds.toTwoPointBounds(data, setPointBounds);
3159
- toBounds$3(setPointBounds, setBounds);
3162
+ toBounds$2(setPointBounds, setBounds);
3160
3163
  },
3161
3164
  toTwoPointBounds(data, setPointBounds) {
3162
3165
  if (!data || !data.length)
3163
- return setPoint$1(setPointBounds, 0, 0);
3166
+ return setPoint(setPointBounds, 0, 0);
3164
3167
  let i = 0, x = 0, y = 0, x1, y1, toX, toY, command;
3165
3168
  const len = data.length;
3166
3169
  while (i < len) {
3167
3170
  command = data[i];
3168
3171
  if (i === 0) {
3169
3172
  if (command === Z$1 || command === C$1 || command === Q) {
3170
- setPoint$1(setPointBounds, x, y);
3173
+ setPoint(setPointBounds, x, y);
3171
3174
  }
3172
3175
  else {
3173
- setPoint$1(setPointBounds, data[i + 1], data[i + 2]);
3176
+ setPoint(setPointBounds, data[i + 1], data[i + 2]);
3174
3177
  }
3175
3178
  }
3176
3179
  switch (command) {
@@ -3178,7 +3181,7 @@ const PathBounds = {
3178
3181
  case L$2:
3179
3182
  x = data[i + 1];
3180
3183
  y = data[i + 2];
3181
- addPoint$1(setPointBounds, x, y);
3184
+ addPoint(setPointBounds, x, y);
3182
3185
  i += 3;
3183
3186
  break;
3184
3187
  case C$1:
@@ -3256,7 +3259,7 @@ const PathBounds = {
3256
3259
  i += 6;
3257
3260
  break;
3258
3261
  default:
3259
- debug$9.error(`command: ${command} [index:${i}]`, data);
3262
+ debug$8.error(`command: ${command} [index:${i}]`, data);
3260
3263
  return;
3261
3264
  }
3262
3265
  }
@@ -3372,7 +3375,7 @@ const FileHelper = {
3372
3375
  const F = FileHelper;
3373
3376
  F.opacityTypes.forEach(type => F.upperCaseTypeMap[type] = type.toUpperCase());
3374
3377
 
3375
- const debug$8 = Debug.get('TaskProcessor');
3378
+ const debug$7 = Debug.get('TaskProcessor');
3376
3379
  class TaskItem {
3377
3380
  constructor(task) {
3378
3381
  this.parallel = true;
@@ -3387,7 +3390,7 @@ class TaskItem {
3387
3390
  yield this.task();
3388
3391
  }
3389
3392
  catch (error) {
3390
- debug$8.error(error);
3393
+ debug$7.error(error);
3391
3394
  }
3392
3395
  });
3393
3396
  }
@@ -4074,7 +4077,7 @@ function defineDataProcessor(target, key, defaultValue) {
4074
4077
  defineKey(data, key, property);
4075
4078
  }
4076
4079
 
4077
- const debug$7 = new Debug('rewrite');
4080
+ const debug$6 = new Debug('rewrite');
4078
4081
  const list = [];
4079
4082
  const excludeNames = ['destroy', 'constructor'];
4080
4083
  function rewrite(method) {
@@ -4091,7 +4094,7 @@ function doRewrite(error) {
4091
4094
  if (list.length) {
4092
4095
  list.forEach(item => {
4093
4096
  if (error)
4094
- debug$7.error(item.name, '需在Class上装饰@rewriteAble()');
4097
+ debug$6.error(item.name, '需在Class上装饰@rewriteAble()');
4095
4098
  item.run();
4096
4099
  });
4097
4100
  list.length = 0;
@@ -4253,18 +4256,21 @@ const LeafHelper = {
4253
4256
  L.setTransform(t, matrix, resize);
4254
4257
  },
4255
4258
  setTransform(t, transform, resize) {
4256
- const layout = getLayout(transform, t.origin && L.getInnerOrigin(t, t.origin), t.around && L.getInnerOrigin(t, t.around));
4259
+ const data = t.__, originPoint = data.origin && L.getInnerOrigin(t, data.origin);
4260
+ const layout = getLayout(transform, originPoint, data.around && L.getInnerOrigin(t, data.around));
4257
4261
  if (resize) {
4258
- const scaleX = layout.scaleX / t.scaleX;
4259
- const scaleY = layout.scaleY / t.scaleY;
4260
- delete layout.scaleX;
4261
- delete layout.scaleY;
4262
+ const scaleX = layout.scaleX / t.scaleX, scaleY = layout.scaleY / t.scaleY;
4263
+ delete layout.scaleX, delete layout.scaleY;
4264
+ if (originPoint) {
4265
+ BoundsHelper.scale(t.boxBounds, Math.abs(scaleX), Math.abs(scaleY));
4266
+ const changedPoint = L.getInnerOrigin(t, data.origin);
4267
+ PointHelper.move(layout, originPoint.x - changedPoint.x, originPoint.y - changedPoint.y);
4268
+ }
4262
4269
  t.set(layout);
4263
- t.scaleResize(scaleX, scaleY, resize !== true);
4270
+ t.scaleResize(scaleX, scaleY, false);
4264
4271
  }
4265
- else {
4272
+ else
4266
4273
  t.set(layout);
4267
- }
4268
4274
  },
4269
4275
  getFlipTransform(t, axis) {
4270
4276
  const m = getMatrixData();
@@ -4805,7 +4811,6 @@ class LayoutEvent extends Event {
4805
4811
  }
4806
4812
  }
4807
4813
  }
4808
- LayoutEvent.CHECK_UPDATE = 'layout.check_update';
4809
4814
  LayoutEvent.REQUEST = 'layout.request';
4810
4815
  LayoutEvent.START = 'layout.start';
4811
4816
  LayoutEvent.BEFORE = 'layout.before';
@@ -4947,14 +4952,15 @@ class Eventer {
4947
4952
  if (list) {
4948
4953
  let item;
4949
4954
  for (let i = 0, len = list.length; i < len; i++) {
4950
- item = list[i];
4951
- item.listener(event);
4952
- if (item.once) {
4953
- this.off(type, item.listener, capture);
4954
- i--, len--;
4955
+ if (item = list[i]) {
4956
+ item.listener(event);
4957
+ if (item.once) {
4958
+ this.off(type, item.listener, capture);
4959
+ i--, len--;
4960
+ }
4961
+ if (event && event.isStopNow)
4962
+ break;
4955
4963
  }
4956
- if (event && event.isStopNow)
4957
- break;
4958
4964
  }
4959
4965
  }
4960
4966
  this.syncEventer && this.syncEventer.emitEvent(event, capture);
@@ -4999,13 +5005,13 @@ const { on, on_, off, off_, once, emit: emit$1, emitEvent, hasEvent, destroy } =
4999
5005
  const LeafEventer = { on, on_, off, off_, once, emit: emit$1, emitEvent, hasEvent, destroyEventer: destroy };
5000
5006
 
5001
5007
  const { isFinite } = Number;
5002
- const debug$6 = Debug.get('setAttr');
5008
+ const debug$5 = Debug.get('setAttr');
5003
5009
  const LeafDataProxy = {
5004
5010
  __setAttr(name, newValue, checkFiniteNumber) {
5005
5011
  if (this.leaferIsCreated) {
5006
5012
  const oldValue = this.__.__getInput(name);
5007
5013
  if (checkFiniteNumber && !isFinite(newValue) && newValue !== undefined) {
5008
- debug$6.warn(this.innerName, name, newValue);
5014
+ debug$5.warn(this.innerName, name, newValue);
5009
5015
  newValue = undefined;
5010
5016
  }
5011
5017
  if (typeof newValue === 'object' || oldValue !== newValue) {
@@ -5075,7 +5081,7 @@ const LeafMatrix = {
5075
5081
  const { updateMatrix: updateMatrix$1, updateAllMatrix: updateAllMatrix$2 } = LeafHelper;
5076
5082
  const { updateBounds: updateBounds$1 } = BranchHelper;
5077
5083
  const { toOuterOf: toOuterOf$1, copyAndSpread: copyAndSpread$1, copy: copy$4 } = BoundsHelper;
5078
- const { toBounds: toBounds$2 } = PathBounds;
5084
+ const { toBounds: toBounds$1 } = PathBounds;
5079
5085
  const LeafBounds = {
5080
5086
  __updateWorldBounds() {
5081
5087
  toOuterOf$1(this.__layout.renderBounds, this.__world, this.__world);
@@ -5157,7 +5163,7 @@ const LeafBounds = {
5157
5163
  const b = this.__layout.boxBounds;
5158
5164
  const data = this.__;
5159
5165
  if (data.__pathInputed) {
5160
- toBounds$2(data.path, b);
5166
+ toBounds$1(data.path, b);
5161
5167
  }
5162
5168
  else {
5163
5169
  b.x = 0;
@@ -5705,7 +5711,7 @@ Leaf = __decorate([
5705
5711
  const { setListWithFn } = BoundsHelper;
5706
5712
  const { sort } = BranchHelper;
5707
5713
  const { localBoxBounds, localStrokeBounds, localRenderBounds, maskLocalBoxBounds, maskLocalStrokeBounds, maskLocalRenderBounds } = LeafBoundsHelper;
5708
- const debug$5 = new Debug('Branch');
5714
+ const debug$4 = new Debug('Branch');
5709
5715
  let Branch = class Branch extends Leaf {
5710
5716
  __updateStrokeSpread() {
5711
5717
  const { children } = this;
@@ -5747,7 +5753,7 @@ let Branch = class Branch extends Leaf {
5747
5753
  }
5748
5754
  add(child, index) {
5749
5755
  if (child === this || child.destroyed)
5750
- return debug$5.warn('add self or destroyed');
5756
+ return debug$4.warn('add self or destroyed');
5751
5757
  const noIndex = index === undefined;
5752
5758
  if (!child.__) {
5753
5759
  if (child instanceof Array)
@@ -6001,7 +6007,7 @@ class LeafLevelList {
6001
6007
  }
6002
6008
  }
6003
6009
 
6004
- const version = "1.2.1";
6010
+ const version = "1.3.0";
6005
6011
 
6006
6012
  class LeaferCanvas extends LeaferCanvasBase {
6007
6013
  get allowBackgroundColor() { return false; }
@@ -6415,7 +6421,7 @@ class LayoutBlockData {
6415
6421
  }
6416
6422
 
6417
6423
  const { updateAllMatrix, updateAllChange } = LeafHelper;
6418
- const debug$4 = Debug.get('Layouter');
6424
+ const debug$3 = Debug.get('Layouter');
6419
6425
  class Layouter {
6420
6426
  constructor(target, userConfig) {
6421
6427
  this.totalTimes = 0;
@@ -6450,7 +6456,7 @@ class Layouter {
6450
6456
  target.emitEvent(new LayoutEvent(LayoutEvent.END, this.layoutedBlocks, this.times));
6451
6457
  }
6452
6458
  catch (e) {
6453
- debug$4.error(e);
6459
+ debug$3.error(e);
6454
6460
  }
6455
6461
  this.layoutedBlocks = null;
6456
6462
  }
@@ -6464,9 +6470,9 @@ class Layouter {
6464
6470
  }
6465
6471
  layoutOnce() {
6466
6472
  if (this.layouting)
6467
- return debug$4.warn('layouting');
6473
+ return debug$3.warn('layouting');
6468
6474
  if (this.times > 3)
6469
- return debug$4.warn('layout max times');
6475
+ return debug$3.warn('layout max times');
6470
6476
  this.times++;
6471
6477
  this.totalTimes++;
6472
6478
  this.layouting = true;
@@ -6570,7 +6576,7 @@ class Layouter {
6570
6576
  }
6571
6577
  }
6572
6578
 
6573
- const debug$3 = Debug.get('Renderer');
6579
+ const debug$2 = Debug.get('Renderer');
6574
6580
  class Renderer {
6575
6581
  get needFill() { return !!(!this.canvas.allowBackgroundColor && this.config.fill); }
6576
6582
  constructor(target, canvas, userConfig) {
@@ -6608,7 +6614,7 @@ class Renderer {
6608
6614
  const { target } = this;
6609
6615
  this.times = 0;
6610
6616
  this.totalBounds = new Bounds();
6611
- debug$3.log(target.innerName, '--->');
6617
+ debug$2.log(target.innerName, '--->');
6612
6618
  try {
6613
6619
  if (!target.isApp)
6614
6620
  target.app.emit(RenderEvent.CHILD_START, target);
@@ -6619,9 +6625,9 @@ class Renderer {
6619
6625
  }
6620
6626
  catch (e) {
6621
6627
  this.rendering = false;
6622
- debug$3.error(e);
6628
+ debug$2.error(e);
6623
6629
  }
6624
- debug$3.log('-------------|');
6630
+ debug$2.log('-------------|');
6625
6631
  }
6626
6632
  renderAgain() {
6627
6633
  if (this.rendering) {
@@ -6633,9 +6639,9 @@ class Renderer {
6633
6639
  }
6634
6640
  renderOnce(callback) {
6635
6641
  if (this.rendering)
6636
- return debug$3.warn('rendering');
6642
+ return debug$2.warn('rendering');
6637
6643
  if (this.times > 3)
6638
- return debug$3.warn('render max times');
6644
+ return debug$2.warn('render max times');
6639
6645
  this.times++;
6640
6646
  this.totalTimes++;
6641
6647
  this.rendering = true;
@@ -6672,7 +6678,7 @@ class Renderer {
6672
6678
  partRender() {
6673
6679
  const { canvas, updateBlocks: list } = this;
6674
6680
  if (!list)
6675
- return debug$3.warn('PartRender: need update attr');
6681
+ return debug$2.warn('PartRender: need update attr');
6676
6682
  this.mergeBlocks();
6677
6683
  list.forEach(block => { if (canvas.bounds.hit(block) && !block.isEmpty())
6678
6684
  this.clipRender(block); });
@@ -6775,7 +6781,7 @@ class Renderer {
6775
6781
  empty = (!leaf.__world.width || !leaf.__world.height);
6776
6782
  if (empty) {
6777
6783
  if (!leaf.isLeafer)
6778
- debug$3.tip(leaf.innerName, ': empty');
6784
+ debug$2.tip(leaf.innerName, ': empty');
6779
6785
  empty = (!leaf.isBranch || leaf.isBranchLeaf);
6780
6786
  }
6781
6787
  return empty;
@@ -6877,7 +6883,7 @@ const Transition = {
6877
6883
 
6878
6884
  const { parse, objectToCanvasData } = PathConvert;
6879
6885
  const emptyPaint = {};
6880
- const debug$2 = Debug.get('UIData');
6886
+ const debug$1 = Debug.get('UIData');
6881
6887
  class UIData extends LeafData {
6882
6888
  get scale() { const { scaleX, scaleY } = this; return scaleX !== scaleY ? { x: scaleX, y: scaleY } : scaleX; }
6883
6889
  get __strokeWidth() {
@@ -6914,7 +6920,7 @@ class UIData extends LeafData {
6914
6920
  if (value < 0) {
6915
6921
  this._width = -value;
6916
6922
  this.__leaf.scaleX *= -1;
6917
- debug$2.warn('width < 0, instead -scaleX ', this);
6923
+ debug$1.warn('width < 0, instead -scaleX ', this);
6918
6924
  }
6919
6925
  else
6920
6926
  this._width = value;
@@ -6923,7 +6929,7 @@ class UIData extends LeafData {
6923
6929
  if (value < 0) {
6924
6930
  this._height = -value;
6925
6931
  this.__leaf.scaleY *= -1;
6926
- debug$2.warn('height < 0, instead -scaleY', this);
6932
+ debug$1.warn('height < 0, instead -scaleY', this);
6927
6933
  }
6928
6934
  else
6929
6935
  this._height = value;
@@ -7300,25 +7306,27 @@ let UI = UI_1 = class UI extends Leaf {
7300
7306
  }
7301
7307
  reset(_data) { }
7302
7308
  set(data, transition) {
7303
- if (transition) {
7304
- if (transition === 'temp') {
7305
- this.lockNormalStyle = true;
7306
- Object.assign(this, data);
7307
- this.lockNormalStyle = false;
7309
+ if (data) {
7310
+ if (transition) {
7311
+ if (transition === 'temp') {
7312
+ this.lockNormalStyle = true;
7313
+ Object.assign(this, data);
7314
+ this.lockNormalStyle = false;
7315
+ }
7316
+ else
7317
+ this.animate(data, transition);
7308
7318
  }
7309
7319
  else
7310
- this.animate(data, transition);
7320
+ Object.assign(this, data);
7311
7321
  }
7312
- else
7313
- Object.assign(this, data);
7314
7322
  }
7315
7323
  get(name) {
7316
7324
  return typeof name === 'string' ? this.__.__getInput(name) : this.__.__getInputData(name);
7317
7325
  }
7318
7326
  createProxyData() { return undefined; }
7319
- find(_condition, _options) { return undefined; }
7327
+ find(_condition, _options) { return Plugin.need('find'); }
7320
7328
  findTag(tag) { return this.find({ tag }); }
7321
- findOne(_condition, _options) { return undefined; }
7329
+ findOne(_condition, _options) { return Plugin.need('find'); }
7322
7330
  findId(id) { return this.findOne({ id }); }
7323
7331
  getPath(curve, pathForRender) {
7324
7332
  this.__layout.update();
@@ -7370,9 +7378,9 @@ let UI = UI_1 = class UI extends Leaf {
7370
7378
  animate(_keyframe, _options, _type, _isTemp) {
7371
7379
  return Plugin.need('animate');
7372
7380
  }
7373
- killAnimate(_type) { }
7374
- export(filename, options) {
7375
- return Export.export(this, filename, options);
7381
+ killAnimate(_type, _killStyle) { }
7382
+ export(_filename, _options) {
7383
+ return Plugin.need('export');
7376
7384
  }
7377
7385
  clone(data) {
7378
7386
  const json = this.toJSON();
@@ -7618,16 +7626,18 @@ let Group = class Group extends UI {
7618
7626
  this.children = [];
7619
7627
  }
7620
7628
  set(data, transition) {
7621
- if (data.children) {
7622
- const { children } = data;
7623
- delete data.children;
7624
- this.children ? this.clear() : this.__setBranch();
7625
- super.set(data, transition);
7626
- children.forEach(child => this.add(child));
7627
- data.children = children;
7629
+ if (data) {
7630
+ if (data.children) {
7631
+ const { children } = data;
7632
+ delete data.children;
7633
+ this.children ? this.clear() : this.__setBranch();
7634
+ super.set(data, transition);
7635
+ children.forEach(child => this.add(child));
7636
+ data.children = children;
7637
+ }
7638
+ else
7639
+ super.set(data, transition);
7628
7640
  }
7629
- else
7630
- super.set(data, transition);
7631
7641
  }
7632
7642
  toJSON(options) {
7633
7643
  const data = super.toJSON(options);
@@ -7659,7 +7669,7 @@ Group = __decorate([
7659
7669
  ], Group);
7660
7670
 
7661
7671
  var Leafer_1;
7662
- const debug$1 = Debug.get('Leafer');
7672
+ const debug = Debug.get('Leafer');
7663
7673
  let Leafer = Leafer_1 = class Leafer extends Group {
7664
7674
  get __tag() { return 'Leafer'; }
7665
7675
  get isApp() { return false; }
@@ -7824,7 +7834,7 @@ let Leafer = Leafer_1 = class Leafer extends Group {
7824
7834
  if (this.canvas) {
7825
7835
  if (canvasSizeAttrs.includes(attrName)) {
7826
7836
  if (!newValue)
7827
- debug$1.warn(attrName + ' is 0');
7837
+ debug.warn(attrName + ' is 0');
7828
7838
  this.__changeCanvasSize(attrName, newValue);
7829
7839
  }
7830
7840
  else if (attrName === 'fill') {
@@ -7890,6 +7900,8 @@ let Leafer = Leafer_1 = class Leafer extends Group {
7890
7900
  this.requestRender();
7891
7901
  }
7892
7902
  }
7903
+ else
7904
+ this.requestRender();
7893
7905
  }
7894
7906
  __checkViewCompleted(emit = true) {
7895
7907
  this.nextRender(() => {
@@ -7963,9 +7975,6 @@ let Leafer = Leafer_1 = class Leafer extends Group {
7963
7975
  this.canvas && this.canvas.updateClientBounds();
7964
7976
  }
7965
7977
  receiveEvent(_event) { }
7966
- __checkUpdateLayout() {
7967
- this.__layout.update();
7968
- }
7969
7978
  emitLeafer(type) {
7970
7979
  this.emitEvent(new LeaferEvent(type, this));
7971
7980
  }
@@ -7976,7 +7985,7 @@ let Leafer = Leafer_1 = class Leafer extends Group {
7976
7985
  this.once(LayoutEvent.END, () => this.__onReady());
7977
7986
  this.once(RenderEvent.START, () => this.__onCreated());
7978
7987
  this.once(RenderEvent.END, () => this.__onViewReady());
7979
- this.__eventIds.push(this.on_(WatchEvent.DATA, this.__onWatchData, this), this.on_(RenderEvent.NEXT, this.__onNextRender, this), this.on_(LayoutEvent.CHECK_UPDATE, this.__checkUpdateLayout, this));
7988
+ this.__eventIds.push(this.on_(WatchEvent.DATA, this.__onWatchData, this), this.on_(RenderEvent.NEXT, this.__onNextRender, this));
7980
7989
  }
7981
7990
  __removeListenEvents() {
7982
7991
  this.off_(this.__eventIds);
@@ -8007,7 +8016,7 @@ let Leafer = Leafer_1 = class Leafer extends Group {
8007
8016
  setTimeout(() => { ImageManager.clearRecycled(); }, 100);
8008
8017
  }
8009
8018
  catch (e) {
8010
- debug$1.error(e);
8019
+ debug.error(e);
8011
8020
  }
8012
8021
  }
8013
8022
  };
@@ -8236,7 +8245,7 @@ Ellipse = __decorate([
8236
8245
 
8237
8246
  const { moveTo: moveTo$2, lineTo: lineTo$2, drawPoints: drawPoints$1 } = PathCommandDataHelper;
8238
8247
  const { rotate: rotate$1, getAngle: getAngle$1, getDistance: getDistance$2, defaultPoint } = PointHelper;
8239
- const { toBounds: toBounds$1 } = PathBounds;
8248
+ const { toBounds } = PathBounds;
8240
8249
  let Line = class Line extends UI {
8241
8250
  get __tag() { return 'Line'; }
8242
8251
  get toPoint() {
@@ -8280,7 +8289,7 @@ let Line = class Line extends UI {
8280
8289
  }
8281
8290
  __updateBoxBounds() {
8282
8291
  if (this.points) {
8283
- toBounds$1(this.__.__pathForRender, this.__layout.boxBounds);
8292
+ toBounds(this.__.__pathForRender, this.__layout.boxBounds);
8284
8293
  }
8285
8294
  else
8286
8295
  super.__updateBoxBounds();
@@ -8455,10 +8464,10 @@ let Canvas = class Canvas extends Rect {
8455
8464
  __updateSize() {
8456
8465
  const { canvas } = this;
8457
8466
  if (canvas) {
8458
- const { smooth } = this.__;
8467
+ const { smooth, safeResize } = this.__;
8468
+ canvas.resize(this.__, safeResize);
8459
8469
  if (canvas.smooth !== smooth)
8460
8470
  canvas.smooth = smooth;
8461
- canvas.resize(this.__);
8462
8471
  }
8463
8472
  }
8464
8473
  destroy() {
@@ -8484,6 +8493,9 @@ __decorate([
8484
8493
  __decorate([
8485
8494
  resizeType(true)
8486
8495
  ], Canvas.prototype, "smooth", void 0);
8496
+ __decorate([
8497
+ dataType(false)
8498
+ ], Canvas.prototype, "safeResize", void 0);
8487
8499
  __decorate([
8488
8500
  resizeType()
8489
8501
  ], Canvas.prototype, "contextSettings", void 0);
@@ -8629,6 +8641,9 @@ __decorate([
8629
8641
  __decorate([
8630
8642
  boundsType(0)
8631
8643
  ], Text.prototype, "paraSpacing", void 0);
8644
+ __decorate([
8645
+ boundsType('x')
8646
+ ], Text.prototype, "writingMode", void 0);
8632
8647
  __decorate([
8633
8648
  boundsType('left')
8634
8649
  ], Text.prototype, "textAlign", void 0);
@@ -10193,197 +10208,12 @@ const ColorConvertModule = {
10193
10208
  string
10194
10209
  };
10195
10210
 
10196
- const { setPoint, addPoint, toBounds } = TwoPointBoundsHelper;
10197
- function getTrimBounds(canvas) {
10198
- const { width, height } = canvas.view;
10199
- const { data } = canvas.context.getImageData(0, 0, width, height);
10200
- let x, y, pointBounds, index = 0;
10201
- for (let i = 0; i < data.length; i += 4) {
10202
- if (data[i + 3] !== 0) {
10203
- x = index % width;
10204
- y = (index - x) / width;
10205
- pointBounds ? addPoint(pointBounds, x, y) : setPoint(pointBounds = {}, x, y);
10206
- }
10207
- index++;
10208
- }
10209
- const bounds = new Bounds();
10210
- toBounds(pointBounds, bounds);
10211
- return bounds.scale(1 / canvas.pixelRatio).ceil();
10212
- }
10213
-
10214
- const ExportModule = {
10215
- export(leaf, filename, options) {
10216
- this.running = true;
10217
- const fileType = FileHelper.fileType(filename);
10218
- const isDownload = filename.includes('.');
10219
- options = FileHelper.getExportOptions(options);
10220
- return addTask((success) => new Promise((resolve) => {
10221
- const over = (result) => {
10222
- success(result);
10223
- resolve();
10224
- this.running = false;
10225
- };
10226
- const { toURL } = Platform;
10227
- const { download } = Platform.origin;
10228
- if (fileType === 'json') {
10229
- isDownload && download(toURL(JSON.stringify(leaf.toJSON(options.json)), 'text'), filename);
10230
- return over({ data: isDownload ? true : leaf.toJSON(options.json) });
10231
- }
10232
- if (fileType === 'svg') {
10233
- isDownload && download(toURL(leaf.toSVG(), 'svg'), filename);
10234
- return over({ data: isDownload ? true : leaf.toSVG() });
10235
- }
10236
- const { leafer } = leaf;
10237
- if (leafer) {
10238
- checkLazy(leaf);
10239
- leafer.waitViewCompleted(() => __awaiter(this, void 0, void 0, function* () {
10240
- let renderBounds, trimBounds, scaleX = 1, scaleY = 1;
10241
- const { worldTransform, isLeafer, isFrame } = leaf;
10242
- const { slice, trim, onCanvas } = options;
10243
- const smooth = options.smooth === undefined ? leafer.config.smooth : options.smooth;
10244
- const contextSettings = options.contextSettings || leafer.config.contextSettings;
10245
- const screenshot = options.screenshot || leaf.isApp;
10246
- const fill = (isLeafer && screenshot) ? (options.fill === undefined ? leaf.fill : options.fill) : options.fill;
10247
- const needFill = FileHelper.isOpaqueImage(filename) || fill, matrix = new Matrix();
10248
- if (screenshot) {
10249
- renderBounds = screenshot === true ? (isLeafer ? leafer.canvas.bounds : leaf.worldRenderBounds) : screenshot;
10250
- }
10251
- else {
10252
- let relative = options.relative || (isLeafer ? 'inner' : 'local');
10253
- scaleX = worldTransform.scaleX;
10254
- scaleY = worldTransform.scaleY;
10255
- switch (relative) {
10256
- case 'inner':
10257
- matrix.set(worldTransform);
10258
- break;
10259
- case 'local':
10260
- matrix.set(worldTransform).divide(leaf.localTransform);
10261
- scaleX /= leaf.scaleX;
10262
- scaleY /= leaf.scaleY;
10263
- break;
10264
- case 'world':
10265
- scaleX = 1;
10266
- scaleY = 1;
10267
- break;
10268
- case 'page':
10269
- relative = leaf.leafer;
10270
- default:
10271
- matrix.set(worldTransform).divide(leaf.getTransform(relative));
10272
- const l = relative.worldTransform;
10273
- scaleX /= scaleX / l.scaleX;
10274
- scaleY /= scaleY / l.scaleY;
10275
- }
10276
- renderBounds = leaf.getBounds('render', relative);
10277
- }
10278
- const scaleData = { scaleX: 1, scaleY: 1 };
10279
- MathHelper.getScaleData(options.scale, options.size, renderBounds, scaleData);
10280
- let pixelRatio = options.pixelRatio || 1;
10281
- if (leaf.isApp) {
10282
- scaleData.scaleX *= pixelRatio;
10283
- scaleData.scaleY *= pixelRatio;
10284
- pixelRatio = leaf.app.pixelRatio;
10285
- }
10286
- const { x, y, width, height } = new Bounds(renderBounds).scale(scaleData.scaleX, scaleData.scaleY);
10287
- const renderOptions = { matrix: matrix.scale(1 / scaleData.scaleX, 1 / scaleData.scaleY).invert().translate(-x, -y).withScale(1 / scaleX * scaleData.scaleX, 1 / scaleY * scaleData.scaleY) };
10288
- let canvas = Creator.canvas({ width: Math.round(width), height: Math.round(height), pixelRatio, smooth, contextSettings });
10289
- let sliceLeaf;
10290
- if (slice) {
10291
- sliceLeaf = leaf;
10292
- sliceLeaf.__worldOpacity = 0;
10293
- leaf = leafer;
10294
- renderOptions.bounds = canvas.bounds;
10295
- }
10296
- canvas.save();
10297
- if (isFrame && fill !== undefined) {
10298
- const oldFill = leaf.get('fill');
10299
- leaf.fill = '';
10300
- leaf.__render(canvas, renderOptions);
10301
- leaf.fill = oldFill;
10302
- }
10303
- else {
10304
- leaf.__render(canvas, renderOptions);
10305
- }
10306
- canvas.restore();
10307
- if (sliceLeaf)
10308
- sliceLeaf.__updateWorldOpacity();
10309
- if (trim) {
10310
- trimBounds = getTrimBounds(canvas);
10311
- const old = canvas, { width, height } = trimBounds;
10312
- const config = { x: 0, y: 0, width, height, pixelRatio };
10313
- canvas = Creator.canvas(config);
10314
- canvas.copyWorld(old, trimBounds, config);
10315
- }
10316
- if (needFill)
10317
- canvas.fillWorld(canvas.bounds, fill || '#FFFFFF', 'destination-over');
10318
- if (onCanvas)
10319
- onCanvas(canvas);
10320
- const data = filename === 'canvas' ? canvas : yield canvas.export(filename, options);
10321
- over({ data, width: canvas.pixelWidth, height: canvas.pixelHeight, renderBounds, trimBounds });
10322
- }));
10323
- }
10324
- else {
10325
- over({ data: false });
10326
- }
10327
- }));
10328
- }
10329
- };
10330
- let tasker;
10331
- function addTask(task) {
10332
- if (!tasker)
10333
- tasker = new TaskProcessor();
10334
- return new Promise((resolve) => {
10335
- tasker.add(() => __awaiter(this, void 0, void 0, function* () { return yield task(resolve); }), { parallel: false });
10336
- });
10337
- }
10338
- function checkLazy(leaf) {
10339
- if (leaf.__.__needComputePaint)
10340
- leaf.__.__computePaint();
10341
- if (leaf.isBranch)
10342
- leaf.children.forEach(child => checkLazy(child));
10343
- }
10344
-
10345
- const canvas = LeaferCanvasBase.prototype;
10346
- const debug = Debug.get('@leafer-ui/export');
10347
- canvas.export = function (filename, options) {
10348
- const { quality, blob } = FileHelper.getExportOptions(options);
10349
- if (filename.includes('.'))
10350
- return this.saveAs(filename, quality);
10351
- else if (blob)
10352
- return this.toBlob(filename, quality);
10353
- else
10354
- return this.toDataURL(filename, quality);
10355
- };
10356
- canvas.toBlob = function (type, quality) {
10357
- return new Promise((resolve) => {
10358
- Platform.origin.canvasToBolb(this.view, type, quality).then((blob) => {
10359
- resolve(blob);
10360
- }).catch((e) => {
10361
- debug.error(e);
10362
- resolve(null);
10363
- });
10364
- });
10365
- };
10366
- canvas.toDataURL = function (type, quality) {
10367
- return Platform.origin.canvasToDataURL(this.view, type, quality);
10368
- };
10369
- canvas.saveAs = function (filename, quality) {
10370
- return new Promise((resolve) => {
10371
- Platform.origin.canvasSaveAs(this.view, filename, quality).then(() => {
10372
- resolve(true);
10373
- }).catch((e) => {
10374
- debug.error(e);
10375
- resolve(false);
10376
- });
10377
- });
10378
- };
10379
-
10380
10211
  Object.assign(TextConvert, TextConvertModule);
10381
10212
  Object.assign(ColorConvert, ColorConvertModule);
10382
10213
  Object.assign(Paint, PaintModule);
10383
10214
  Object.assign(PaintImage, PaintImageModule);
10384
10215
  Object.assign(PaintGradient, PaintGradientModule);
10385
10216
  Object.assign(Effect, EffectModule);
10386
- Object.assign(Export, ExportModule);
10387
10217
 
10388
10218
  try {
10389
10219
  if (wx)