@univerjs/engine-render 0.22.0 → 0.22.1-insiders.20260515-225d350

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.
Files changed (5) hide show
  1. package/lib/cjs/index.js +44 -38
  2. package/lib/es/index.js +44 -38
  3. package/lib/umd/index.js +1 -1
  4. package/package.json +3 -3
  5. package/LICENSE +0 -176
package/lib/cjs/index.js CHANGED
@@ -18420,40 +18420,24 @@ var Font = class extends SheetExtension {
18420
18420
  return false;
18421
18421
  }
18422
18422
  _renderImages(ctx, fontsConfig, startX, startY, endX, endY) {
18423
- var _getSkeletonData;
18423
+ var _fontsConfig$style, _padding$l, _padding$r, _padding$t, _padding$b, _getSkeletonData;
18424
18424
  const { documentSkeleton, verticalAlign, horizontalAlign } = fontsConfig;
18425
- const fontHeight = documentSkeleton.getSkeletonData().pages[0].height;
18426
- const fontWidth = documentSkeleton.getSkeletonData().pages[0].width;
18427
18425
  const PADDING = 2;
18428
- let fontX = startX;
18429
- let fontY = startY;
18430
- switch (verticalAlign) {
18431
- case _univerjs_core.VerticalAlign.TOP:
18432
- fontY = startY + PADDING;
18433
- break;
18434
- case _univerjs_core.VerticalAlign.MIDDLE:
18435
- fontY = (startY + endY) / 2 - fontHeight / 2;
18436
- break;
18437
- default:
18438
- fontY = endY - fontHeight - PADDING;
18439
- break;
18440
- }
18441
- switch (horizontalAlign) {
18442
- case _univerjs_core.HorizontalAlign.RIGHT:
18443
- fontX = endX - fontWidth - PADDING;
18444
- break;
18445
- case _univerjs_core.HorizontalAlign.CENTER:
18446
- fontX = (startX + endX) / 2 - fontWidth / 2;
18447
- break;
18448
- default:
18449
- fontX = startX + PADDING;
18450
- break;
18451
- }
18426
+ const padding = (_fontsConfig$style = fontsConfig.style) === null || _fontsConfig$style === void 0 ? void 0 : _fontsConfig$style.pd;
18427
+ const paddingLeft = (_padding$l = padding === null || padding === void 0 ? void 0 : padding.l) !== null && _padding$l !== void 0 ? _padding$l : PADDING;
18428
+ const paddingRight = (_padding$r = padding === null || padding === void 0 ? void 0 : padding.r) !== null && _padding$r !== void 0 ? _padding$r : PADDING;
18429
+ const paddingTop = (_padding$t = padding === null || padding === void 0 ? void 0 : padding.t) !== null && _padding$t !== void 0 ? _padding$t : PADDING;
18430
+ const paddingBottom = (_padding$b = padding === null || padding === void 0 ? void 0 : padding.b) !== null && _padding$b !== void 0 ? _padding$b : PADDING;
18431
+ const contentStartX = startX + paddingLeft;
18432
+ const contentEndX = endX - paddingRight;
18433
+ const contentStartY = startY + paddingTop;
18434
+ const contentEndY = endY - paddingBottom;
18452
18435
  const drawingDatas = documentSkeleton.getViewModel().getDataModel().getDrawings();
18453
18436
  const drawings = (_getSkeletonData = documentSkeleton.getSkeletonData()) === null || _getSkeletonData === void 0 ? void 0 : _getSkeletonData.pages[0].skeDrawings;
18454
18437
  drawings === null || drawings === void 0 || drawings.forEach((drawing) => {
18455
18438
  const drawingData = drawingDatas === null || drawingDatas === void 0 ? void 0 : drawingDatas[drawing.drawingId];
18456
18439
  if (drawingData) {
18440
+ var _drawingData$docTrans, _drawingData$docTrans2, _drawingData$docTrans3, _drawingData$docTrans4, _drawingData$docTrans5, _drawingData$docTrans6;
18457
18441
  const image = fontsConfig.imageCacheMap.getImage(drawingData.imageSourceType, drawingData.source, () => {
18458
18442
  var _this$parent;
18459
18443
  (_this$parent = this.parent) === null || _this$parent === void 0 || _this$parent.makeDirty();
@@ -18461,11 +18445,33 @@ var Font = class extends SheetExtension {
18461
18445
  var _this$parent2;
18462
18446
  (_this$parent2 = this.parent) === null || _this$parent2 === void 0 || _this$parent2.makeDirty();
18463
18447
  });
18464
- const x = fontX + drawing.aLeft;
18465
- const y = fontY + drawing.aTop;
18466
- const width = drawing.width;
18467
- const height = drawing.height;
18468
- const angle = drawing.angle;
18448
+ const width = (_drawingData$docTrans = (_drawingData$docTrans2 = drawingData.docTransform) === null || _drawingData$docTrans2 === void 0 ? void 0 : _drawingData$docTrans2.size.width) !== null && _drawingData$docTrans !== void 0 ? _drawingData$docTrans : drawing.width;
18449
+ const height = (_drawingData$docTrans3 = (_drawingData$docTrans4 = drawingData.docTransform) === null || _drawingData$docTrans4 === void 0 ? void 0 : _drawingData$docTrans4.size.height) !== null && _drawingData$docTrans3 !== void 0 ? _drawingData$docTrans3 : drawing.height;
18450
+ const angle = (_drawingData$docTrans5 = (_drawingData$docTrans6 = drawingData.docTransform) === null || _drawingData$docTrans6 === void 0 ? void 0 : _drawingData$docTrans6.angle) !== null && _drawingData$docTrans5 !== void 0 ? _drawingData$docTrans5 : drawing.angle;
18451
+ let x = startX;
18452
+ let y = startY;
18453
+ switch (verticalAlign) {
18454
+ case _univerjs_core.VerticalAlign.TOP:
18455
+ y = contentStartY;
18456
+ break;
18457
+ case _univerjs_core.VerticalAlign.MIDDLE:
18458
+ y = (contentStartY + contentEndY) / 2 - height / 2;
18459
+ break;
18460
+ default:
18461
+ y = contentEndY - height;
18462
+ break;
18463
+ }
18464
+ switch (horizontalAlign) {
18465
+ case _univerjs_core.HorizontalAlign.RIGHT:
18466
+ x = contentEndX - width;
18467
+ break;
18468
+ case _univerjs_core.HorizontalAlign.CENTER:
18469
+ x = (contentStartX + contentEndX) / 2 - width / 2;
18470
+ break;
18471
+ default:
18472
+ x = contentStartX;
18473
+ break;
18474
+ }
18469
18475
  const { rotatedHeight, rotatedWidth } = rotatedBoundingBox(width, height, angle);
18470
18476
  if (image && image.complete) {
18471
18477
  const angleRadians = angle * Math.PI / 180;
@@ -18533,14 +18539,14 @@ var Font = class extends SheetExtension {
18533
18539
  renderFontContext.endY = endY;
18534
18540
  }
18535
18541
  _renderText(ctx, row, col, renderFontCtx, overflowCache) {
18536
- var _fontCache$style$pd, _fontCache$style, _padding$l, _padding$r, _padding$t, _padding$b, _fontCache$style2, _fontCache$style3, _fontCache$style4, _fontCache$style5;
18542
+ var _fontCache$style$pd, _fontCache$style, _padding$l2, _padding$r2, _padding$t2, _padding$b2, _fontCache$style2, _fontCache$style3, _fontCache$style4, _fontCache$style5;
18537
18543
  const { fontCache } = renderFontCtx;
18538
18544
  if (!fontCache) return;
18539
18545
  const padding = (_fontCache$style$pd = (_fontCache$style = fontCache.style) === null || _fontCache$style === void 0 ? void 0 : _fontCache$style.pd) !== null && _fontCache$style$pd !== void 0 ? _fontCache$style$pd : DEFAULT_PADDING_DATA;
18540
- const paddingLeft = (_padding$l = padding.l) !== null && _padding$l !== void 0 ? _padding$l : DEFAULT_PADDING_DATA.l;
18541
- const paddingRight = (_padding$r = padding.r) !== null && _padding$r !== void 0 ? _padding$r : DEFAULT_PADDING_DATA.r;
18542
- const paddingTop = (_padding$t = padding.t) !== null && _padding$t !== void 0 ? _padding$t : DEFAULT_PADDING_DATA.t;
18543
- const paddingBottom = (_padding$b = padding.b) !== null && _padding$b !== void 0 ? _padding$b : DEFAULT_PADDING_DATA.b;
18546
+ const paddingLeft = (_padding$l2 = padding.l) !== null && _padding$l2 !== void 0 ? _padding$l2 : DEFAULT_PADDING_DATA.l;
18547
+ const paddingRight = (_padding$r2 = padding.r) !== null && _padding$r2 !== void 0 ? _padding$r2 : DEFAULT_PADDING_DATA.r;
18548
+ const paddingTop = (_padding$t2 = padding.t) !== null && _padding$t2 !== void 0 ? _padding$t2 : DEFAULT_PADDING_DATA.t;
18549
+ const paddingBottom = (_padding$b2 = padding.b) !== null && _padding$b2 !== void 0 ? _padding$b2 : DEFAULT_PADDING_DATA.b;
18544
18550
  const { vertexAngle = 0, wrapStrategy, cellData } = fontCache;
18545
18551
  if ((cellData === null || cellData === void 0 ? void 0 : cellData.v) === void 0 || (cellData === null || cellData === void 0 ? void 0 : cellData.v) === null) return;
18546
18552
  const text = (0, _univerjs_core.getDisplayValueFromCell)(cellData);
@@ -24468,7 +24474,7 @@ Engine = __decorate([__decorateParam(2, ICanvasColorService)], Engine);
24468
24474
  //#endregion
24469
24475
  //#region package.json
24470
24476
  var name = "@univerjs/engine-render";
24471
- var version = "0.22.0";
24477
+ var version = "0.22.1-insiders.20260515-225d350";
24472
24478
 
24473
24479
  //#endregion
24474
24480
  //#region src/config/config.ts
package/lib/es/index.js CHANGED
@@ -18391,40 +18391,24 @@ var Font = class extends SheetExtension {
18391
18391
  return false;
18392
18392
  }
18393
18393
  _renderImages(ctx, fontsConfig, startX, startY, endX, endY) {
18394
- var _getSkeletonData;
18394
+ var _fontsConfig$style, _padding$l, _padding$r, _padding$t, _padding$b, _getSkeletonData;
18395
18395
  const { documentSkeleton, verticalAlign, horizontalAlign } = fontsConfig;
18396
- const fontHeight = documentSkeleton.getSkeletonData().pages[0].height;
18397
- const fontWidth = documentSkeleton.getSkeletonData().pages[0].width;
18398
18396
  const PADDING = 2;
18399
- let fontX = startX;
18400
- let fontY = startY;
18401
- switch (verticalAlign) {
18402
- case VerticalAlign.TOP:
18403
- fontY = startY + PADDING;
18404
- break;
18405
- case VerticalAlign.MIDDLE:
18406
- fontY = (startY + endY) / 2 - fontHeight / 2;
18407
- break;
18408
- default:
18409
- fontY = endY - fontHeight - PADDING;
18410
- break;
18411
- }
18412
- switch (horizontalAlign) {
18413
- case HorizontalAlign.RIGHT:
18414
- fontX = endX - fontWidth - PADDING;
18415
- break;
18416
- case HorizontalAlign.CENTER:
18417
- fontX = (startX + endX) / 2 - fontWidth / 2;
18418
- break;
18419
- default:
18420
- fontX = startX + PADDING;
18421
- break;
18422
- }
18397
+ const padding = (_fontsConfig$style = fontsConfig.style) === null || _fontsConfig$style === void 0 ? void 0 : _fontsConfig$style.pd;
18398
+ const paddingLeft = (_padding$l = padding === null || padding === void 0 ? void 0 : padding.l) !== null && _padding$l !== void 0 ? _padding$l : PADDING;
18399
+ const paddingRight = (_padding$r = padding === null || padding === void 0 ? void 0 : padding.r) !== null && _padding$r !== void 0 ? _padding$r : PADDING;
18400
+ const paddingTop = (_padding$t = padding === null || padding === void 0 ? void 0 : padding.t) !== null && _padding$t !== void 0 ? _padding$t : PADDING;
18401
+ const paddingBottom = (_padding$b = padding === null || padding === void 0 ? void 0 : padding.b) !== null && _padding$b !== void 0 ? _padding$b : PADDING;
18402
+ const contentStartX = startX + paddingLeft;
18403
+ const contentEndX = endX - paddingRight;
18404
+ const contentStartY = startY + paddingTop;
18405
+ const contentEndY = endY - paddingBottom;
18423
18406
  const drawingDatas = documentSkeleton.getViewModel().getDataModel().getDrawings();
18424
18407
  const drawings = (_getSkeletonData = documentSkeleton.getSkeletonData()) === null || _getSkeletonData === void 0 ? void 0 : _getSkeletonData.pages[0].skeDrawings;
18425
18408
  drawings === null || drawings === void 0 || drawings.forEach((drawing) => {
18426
18409
  const drawingData = drawingDatas === null || drawingDatas === void 0 ? void 0 : drawingDatas[drawing.drawingId];
18427
18410
  if (drawingData) {
18411
+ var _drawingData$docTrans, _drawingData$docTrans2, _drawingData$docTrans3, _drawingData$docTrans4, _drawingData$docTrans5, _drawingData$docTrans6;
18428
18412
  const image = fontsConfig.imageCacheMap.getImage(drawingData.imageSourceType, drawingData.source, () => {
18429
18413
  var _this$parent;
18430
18414
  (_this$parent = this.parent) === null || _this$parent === void 0 || _this$parent.makeDirty();
@@ -18432,11 +18416,33 @@ var Font = class extends SheetExtension {
18432
18416
  var _this$parent2;
18433
18417
  (_this$parent2 = this.parent) === null || _this$parent2 === void 0 || _this$parent2.makeDirty();
18434
18418
  });
18435
- const x = fontX + drawing.aLeft;
18436
- const y = fontY + drawing.aTop;
18437
- const width = drawing.width;
18438
- const height = drawing.height;
18439
- const angle = drawing.angle;
18419
+ const width = (_drawingData$docTrans = (_drawingData$docTrans2 = drawingData.docTransform) === null || _drawingData$docTrans2 === void 0 ? void 0 : _drawingData$docTrans2.size.width) !== null && _drawingData$docTrans !== void 0 ? _drawingData$docTrans : drawing.width;
18420
+ const height = (_drawingData$docTrans3 = (_drawingData$docTrans4 = drawingData.docTransform) === null || _drawingData$docTrans4 === void 0 ? void 0 : _drawingData$docTrans4.size.height) !== null && _drawingData$docTrans3 !== void 0 ? _drawingData$docTrans3 : drawing.height;
18421
+ const angle = (_drawingData$docTrans5 = (_drawingData$docTrans6 = drawingData.docTransform) === null || _drawingData$docTrans6 === void 0 ? void 0 : _drawingData$docTrans6.angle) !== null && _drawingData$docTrans5 !== void 0 ? _drawingData$docTrans5 : drawing.angle;
18422
+ let x = startX;
18423
+ let y = startY;
18424
+ switch (verticalAlign) {
18425
+ case VerticalAlign.TOP:
18426
+ y = contentStartY;
18427
+ break;
18428
+ case VerticalAlign.MIDDLE:
18429
+ y = (contentStartY + contentEndY) / 2 - height / 2;
18430
+ break;
18431
+ default:
18432
+ y = contentEndY - height;
18433
+ break;
18434
+ }
18435
+ switch (horizontalAlign) {
18436
+ case HorizontalAlign.RIGHT:
18437
+ x = contentEndX - width;
18438
+ break;
18439
+ case HorizontalAlign.CENTER:
18440
+ x = (contentStartX + contentEndX) / 2 - width / 2;
18441
+ break;
18442
+ default:
18443
+ x = contentStartX;
18444
+ break;
18445
+ }
18440
18446
  const { rotatedHeight, rotatedWidth } = rotatedBoundingBox(width, height, angle);
18441
18447
  if (image && image.complete) {
18442
18448
  const angleRadians = angle * Math.PI / 180;
@@ -18504,14 +18510,14 @@ var Font = class extends SheetExtension {
18504
18510
  renderFontContext.endY = endY;
18505
18511
  }
18506
18512
  _renderText(ctx, row, col, renderFontCtx, overflowCache) {
18507
- var _fontCache$style$pd, _fontCache$style, _padding$l, _padding$r, _padding$t, _padding$b, _fontCache$style2, _fontCache$style3, _fontCache$style4, _fontCache$style5;
18513
+ var _fontCache$style$pd, _fontCache$style, _padding$l2, _padding$r2, _padding$t2, _padding$b2, _fontCache$style2, _fontCache$style3, _fontCache$style4, _fontCache$style5;
18508
18514
  const { fontCache } = renderFontCtx;
18509
18515
  if (!fontCache) return;
18510
18516
  const padding = (_fontCache$style$pd = (_fontCache$style = fontCache.style) === null || _fontCache$style === void 0 ? void 0 : _fontCache$style.pd) !== null && _fontCache$style$pd !== void 0 ? _fontCache$style$pd : DEFAULT_PADDING_DATA;
18511
- const paddingLeft = (_padding$l = padding.l) !== null && _padding$l !== void 0 ? _padding$l : DEFAULT_PADDING_DATA.l;
18512
- const paddingRight = (_padding$r = padding.r) !== null && _padding$r !== void 0 ? _padding$r : DEFAULT_PADDING_DATA.r;
18513
- const paddingTop = (_padding$t = padding.t) !== null && _padding$t !== void 0 ? _padding$t : DEFAULT_PADDING_DATA.t;
18514
- const paddingBottom = (_padding$b = padding.b) !== null && _padding$b !== void 0 ? _padding$b : DEFAULT_PADDING_DATA.b;
18517
+ const paddingLeft = (_padding$l2 = padding.l) !== null && _padding$l2 !== void 0 ? _padding$l2 : DEFAULT_PADDING_DATA.l;
18518
+ const paddingRight = (_padding$r2 = padding.r) !== null && _padding$r2 !== void 0 ? _padding$r2 : DEFAULT_PADDING_DATA.r;
18519
+ const paddingTop = (_padding$t2 = padding.t) !== null && _padding$t2 !== void 0 ? _padding$t2 : DEFAULT_PADDING_DATA.t;
18520
+ const paddingBottom = (_padding$b2 = padding.b) !== null && _padding$b2 !== void 0 ? _padding$b2 : DEFAULT_PADDING_DATA.b;
18515
18521
  const { vertexAngle = 0, wrapStrategy, cellData } = fontCache;
18516
18522
  if ((cellData === null || cellData === void 0 ? void 0 : cellData.v) === void 0 || (cellData === null || cellData === void 0 ? void 0 : cellData.v) === null) return;
18517
18523
  const text = getDisplayValueFromCell(cellData);
@@ -24439,7 +24445,7 @@ Engine = __decorate([__decorateParam(2, ICanvasColorService)], Engine);
24439
24445
  //#endregion
24440
24446
  //#region package.json
24441
24447
  var name = "@univerjs/engine-render";
24442
- var version = "0.22.0";
24448
+ var version = "0.22.1-insiders.20260515-225d350";
24443
24449
 
24444
24450
  //#endregion
24445
24451
  //#region src/config/config.ts