@univerjs/engine-render 0.4.2-nightly.202411021605 → 0.4.2-nightly.202411041606

package/lib/es/index.js

@@ -22,7 +22,7 @@ const MIDDLE_CELL_POS_MAGIC_NUMBER = 1, DEFAULT_FONTFACE_PLANE = '"Helvetica Neu
 var CURSOR_TYPE = /* @__PURE__ */ ((CURSOR_TYPE2) => (CURSOR_TYPE2.DEFAULT = "default", CURSOR_TYPE2.AUTO = "auto", CURSOR_TYPE2.CROSSHAIR = "crosshair", CURSOR_TYPE2.POINTER = "pointer", CURSOR_TYPE2.MOVE = "move", CURSOR_TYPE2.EAST_RESIZE = "e-resize", CURSOR_TYPE2.NORTH_EAST_RESIZE = "ne-resize", CURSOR_TYPE2.NORTH_WEST_RESIZE = "nw-resize", CURSOR_TYPE2.NORTH_RESIZE = "n-resize", CURSOR_TYPE2.SOUTH_EAST_RESIZE = "se-resize", CURSOR_TYPE2.SOUTH_WEST_RESIZE = "sw-resize", CURSOR_TYPE2.SOUTH_RESIZE = "s-resize", CURSOR_TYPE2.WEST_RESIZE = "w-resize", CURSOR_TYPE2.TEXT = "text", CURSOR_TYPE2.WAIT = "wait", CURSOR_TYPE2.HELP = "help", CURSOR_TYPE2.CELL = "cell", CURSOR_TYPE2.NONE = "none", CURSOR_TYPE2.VERTICAL_TEXT = "vertical-text", CURSOR_TYPE2.NO_DROP = "no-drop", CURSOR_TYPE2.GRAB = "grab", CURSOR_TYPE2.GRABBING = "grabbing", CURSOR_TYPE2.ALL_SCROLL = "all-scroll", CURSOR_TYPE2.COLUMN_RESIZE = "col-resize", CURSOR_TYPE2.ROW_RESIZE = "row-resize", CURSOR_TYPE2.PROGRESS = "progress", CURSOR_TYPE2.NOT_ALLOWED = "not-allowed", CURSOR_TYPE2.ZOOM_IN = "zoom-in", CURSOR_TYPE2.ZOOM_OUT = "zoom-out", CURSOR_TYPE2))(CURSOR_TYPE || {}), DOCUMENT_CONTEXT_CLIP_TYPE = /* @__PURE__ */ ((DOCUMENT_CONTEXT_CLIP_TYPE2) => (DOCUMENT_CONTEXT_CLIP_TYPE2[DOCUMENT_CONTEXT_CLIP_TYPE2.noClip = 0] = "noClip", DOCUMENT_CONTEXT_CLIP_TYPE2[DOCUMENT_CONTEXT_CLIP_TYPE2.DOC_SIZE = 1] = "DOC_SIZE", DOCUMENT_CONTEXT_CLIP_TYPE2[DOCUMENT_CONTEXT_CLIP_TYPE2.CONTENT_SIZE_LEFT = 2] = "CONTENT_SIZE_LEFT", DOCUMENT_CONTEXT_CLIP_TYPE2[DOCUMENT_CONTEXT_CLIP_TYPE2.CONTENT_SIZE_CENTER = 3] = "CONTENT_SIZE_CENTER", DOCUMENT_CONTEXT_CLIP_TYPE2[DOCUMENT_CONTEXT_CLIP_TYPE2.CONTENT_SIZE_Right = 4] = "CONTENT_SIZE_Right", DOCUMENT_CONTEXT_CLIP_TYPE2))(DOCUMENT_CONTEXT_CLIP_TYPE || {});
 const COLOR_BLACK_RGB = "rgb(0,0,0)";
 var BORDER_TYPE = /* @__PURE__ */ ((BORDER_TYPE2) => (BORDER_TYPE2.TOP = "t", BORDER_TYPE2.BOTTOM = "b", BORDER_TYPE2.LEFT = "l", BORDER_TYPE2.RIGHT = "r", BORDER_TYPE2.TL_BR = "tl_br", BORDER_TYPE2.TL_BC = "tl_bc", BORDER_TYPE2.TL_MR = "tl_mr", BORDER_TYPE2.BL_TR = "bl_tr", BORDER_TYPE2.ML_TR = "ml_tr", BORDER_TYPE2.BC_TR = "bc_tr", BORDER_TYPE2))(BORDER_TYPE || {}), ORIENTATION_TYPE = /* @__PURE__ */ ((ORIENTATION_TYPE2) => (ORIENTATION_TYPE2[ORIENTATION_TYPE2.UP = 0] = "UP", ORIENTATION_TYPE2[ORIENTATION_TYPE2.DOWN = 1] = "DOWN", ORIENTATION_TYPE2))(ORIENTATION_TYPE || {}), RENDER_CLASS_TYPE = /* @__PURE__ */ ((RENDER_CLASS_TYPE2) => (RENDER_CLASS_TYPE2.ENGINE = "Engine", RENDER_CLASS_TYPE2.SCENE = "Scene", RENDER_CLASS_TYPE2.BASE_OBJECT = "BaseObject", RENDER_CLASS_TYPE2.SCENE_VIEWER = "SceneViewer", RENDER_CLASS_TYPE2.CANVAS = "Canvas", RENDER_CLASS_TYPE2.VIEWPORT = "Viewport", RENDER_CLASS_TYPE2.LAYER = "Layer", RENDER_CLASS_TYPE2.GROUP = "Group", RENDER_CLASS_TYPE2.IMAGE = "Image", RENDER_CLASS_TYPE2.SHAPE = "Shape", RENDER_CLASS_TYPE2.TEXT = "Text", RENDER_CLASS_TYPE2))(RENDER_CLASS_TYPE || {});
-const MAXIMUM_ROW_HEIGHT = 2e3, MAXIMUM_COL_WIDTH = 2e3, FIX_ONE_PIXEL_BLUR_OFFSET = 0.5, DRAWING_OBJECT_LOWER_LAYER_INDEX = 3, DRAWING_OBJECT_LAYER_INDEX = 4, DRAWING_OBJECT_UPPER_LAYER_INDEX = 5;
+const MAXIMUM_ROW_HEIGHT = 2e3, MAXIMUM_COL_WIDTH = 2e3, MIN_COL_WIDTH = 2, FIX_ONE_PIXEL_BLUR_OFFSET = 0.5, DRAWING_OBJECT_LOWER_LAYER_INDEX = 3, DRAWING_OBJECT_LAYER_INDEX = 4, DRAWING_OBJECT_UPPER_LAYER_INDEX = 5;
 var TRANSFORM_CHANGE_OBSERVABLE_TYPE = /* @__PURE__ */ ((TRANSFORM_CHANGE_OBSERVABLE_TYPE2) => (TRANSFORM_CHANGE_OBSERVABLE_TYPE2[TRANSFORM_CHANGE_OBSERVABLE_TYPE2.translate = 0] = "translate", TRANSFORM_CHANGE_OBSERVABLE_TYPE2[TRANSFORM_CHANGE_OBSERVABLE_TYPE2.resize = 1] = "resize", TRANSFORM_CHANGE_OBSERVABLE_TYPE2[TRANSFORM_CHANGE_OBSERVABLE_TYPE2.scale = 2] = "scale", TRANSFORM_CHANGE_OBSERVABLE_TYPE2[TRANSFORM_CHANGE_OBSERVABLE_TYPE2.skew = 3] = "skew", TRANSFORM_CHANGE_OBSERVABLE_TYPE2[TRANSFORM_CHANGE_OBSERVABLE_TYPE2.flip = 4] = "flip", TRANSFORM_CHANGE_OBSERVABLE_TYPE2[TRANSFORM_CHANGE_OBSERVABLE_TYPE2.all = 5] = "all", TRANSFORM_CHANGE_OBSERVABLE_TYPE2))(TRANSFORM_CHANGE_OBSERVABLE_TYPE || {});
 const _Base = class _Base {
   isEmpty() {
@@ -4919,7 +4919,7 @@ __name(_Custom, "Custom");
 let Custom = _Custom;
 SpreadsheetExtensionRegistry.add(Custom);
 var ShowGridlinesState = /* @__PURE__ */ ((ShowGridlinesState2) => (ShowGridlinesState2[ShowGridlinesState2.OFF = 0] = "OFF", ShowGridlinesState2[ShowGridlinesState2.ON = 1] = "ON", ShowGridlinesState2))(ShowGridlinesState || {}), SHEET_VIEWPORT_KEY = /* @__PURE__ */ ((SHEET_VIEWPORT_KEY2) => (SHEET_VIEWPORT_KEY2.VIEW_MAIN = "viewMain", SHEET_VIEWPORT_KEY2.VIEW_MAIN_LEFT_TOP = "viewMainLeftTop", SHEET_VIEWPORT_KEY2.VIEW_MAIN_TOP = "viewMainTop", SHEET_VIEWPORT_KEY2.VIEW_MAIN_LEFT = "viewMainLeft", SHEET_VIEWPORT_KEY2.VIEW_ROW_TOP = "viewRowTop", SHEET_VIEWPORT_KEY2.VIEW_ROW_BOTTOM = "viewRowBottom", SHEET_VIEWPORT_KEY2.VIEW_COLUMN_LEFT = "viewColumnLeft", SHEET_VIEWPORT_KEY2.VIEW_COLUMN_RIGHT = "viewColumnRight", SHEET_VIEWPORT_KEY2.VIEW_LEFT_TOP = "viewLeftTop", SHEET_VIEWPORT_KEY2))(SHEET_VIEWPORT_KEY || {});
-const FONT_EXTENSION_Z_INDEX = 45, EXPAND_SIZE_FOR_RENDER_OVERFLOW = 20, sheetContentViewportKeys = [SHEET_VIEWPORT_KEY.VIEW_MAIN, SHEET_VIEWPORT_KEY.VIEW_MAIN_LEFT_TOP, SHEET_VIEWPORT_KEY.VIEW_MAIN_TOP, SHEET_VIEWPORT_KEY.VIEW_MAIN_LEFT], sheetHeaderViewportKeys = [SHEET_VIEWPORT_KEY.VIEW_ROW_TOP, SHEET_VIEWPORT_KEY.VIEW_ROW_BOTTOM, SHEET_VIEWPORT_KEY.VIEW_COLUMN_LEFT, SHEET_VIEWPORT_KEY.VIEW_COLUMN_RIGHT, SHEET_VIEWPORT_KEY.VIEW_LEFT_TOP];
+const FONT_EXTENSION_Z_INDEX = 45, EXPAND_SIZE_FOR_RENDER_OVERFLOW = 20, sheetContentViewportKeys = [SHEET_VIEWPORT_KEY.VIEW_MAIN, SHEET_VIEWPORT_KEY.VIEW_MAIN_LEFT_TOP, SHEET_VIEWPORT_KEY.VIEW_MAIN_TOP, SHEET_VIEWPORT_KEY.VIEW_MAIN_LEFT], sheetHeaderViewportKeys = [SHEET_VIEWPORT_KEY.VIEW_ROW_TOP, SHEET_VIEWPORT_KEY.VIEW_ROW_BOTTOM, SHEET_VIEWPORT_KEY.VIEW_COLUMN_LEFT, SHEET_VIEWPORT_KEY.VIEW_COLUMN_RIGHT, SHEET_VIEWPORT_KEY.VIEW_LEFT_TOP], MEASURE_EXTENT = 1e4, MEASURE_EXTENT_FOR_PARAGRAPH = MEASURE_EXTENT / 10;
 var __defProp$4 = Object.defineProperty, __getOwnPropDesc$4 = Object.getOwnPropertyDescriptor, __decorateClass$4 = /* @__PURE__ */ __name((decorators, target, key, kind) => {
   for (var result = kind > 1 ? void 0 : kind ? __getOwnPropDesc$4(target, key) : target, i = decorators.length - 1, decorator; i >= 0; i--)
     (decorator = decorators[i]) && (result = (kind ? decorator(target, key, result) : decorator(result)) || result);
@@ -25079,7 +25079,7 @@ let SpreadsheetSkeleton = (_a6 = class extends Skeleton {
     let colWidth = 0;
     const visibleRangeViewMain = this.visibleRangeByViewportKey(SHEET_VIEWPORT_KEY.VIEW_MAIN);
     if (!visibleRangeViewMain) return colWidth;
-    const { startRow: startRowOfViewMain, endRow: endRowOfViewMain } = visibleRangeViewMain, rowCount = this.worksheet.getRowCount(), checkStart = Math.max(0, startRowOfViewMain - 1e4), checkEnd = Math.min(rowCount, endRowOfViewMain + 1e4), otherRowIndex = /* @__PURE__ */ new Set();
+    const { startRow: startRowOfViewMain, endRow: endRowOfViewMain } = visibleRangeViewMain, rowCount = this.worksheet.getRowCount(), otherRowIndex = /* @__PURE__ */ new Set();
     otherRowIndex.add(0), otherRowIndex.add(rowCount - 1);
     const visibleRangeViewMainTop = this.visibleRangeByViewportKey(SHEET_VIEWPORT_KEY.VIEW_MAIN_TOP);
     if (visibleRangeViewMainTop) {
@@ -25087,21 +25087,22 @@ let SpreadsheetSkeleton = (_a6 = class extends Skeleton {
       for (let i = startRowOfViewMainTop; i <= endRowOfViewMainTop; i++)
         otherRowIndex.add(i);
     }
-    const rowIdxArr = (/* @__PURE__ */ __name((start, end, additionalArr) => [...Array.from(
+    const createRowSequence = /* @__PURE__ */ __name((start, end, additionalArr) => [...Array.from(
       { length: end - start + 1 },
       (_2, i) => i + start
-    ), ...additionalArr], "createRowSequence"))(checkStart, checkEnd, otherRowIndex), preColIndex = Math.max(0, colIndex - 1), currColWidth = this._columnWidthAccumulation[colIndex] - this._columnWidthAccumulation[preColIndex];
+    ), ...additionalArr], "createRowSequence"), checkStartRow = Math.max(0, startRowOfViewMain - MEASURE_EXTENT), checkEndRow = Math.min(rowCount, endRowOfViewMain + MEASURE_EXTENT), rowIdxArr = createRowSequence(checkStartRow, checkEndRow, otherRowIndex), preColIndex = Math.max(0, colIndex - 1);
+    let currColWidth = this._columnWidthAccumulation[colIndex] - this._columnWidthAccumulation[preColIndex];
+    colIndex === 0 && (currColWidth = this._columnWidthAccumulation[colIndex]);
     for (let i = 0; i < rowIdxArr.length; i++) {
       const row = rowIdxArr[i], { isMerged, isMergedMainCell } = this._getCellMergeInfo(colIndex, row);
       if (isMerged && !isMergedMainCell || !this.worksheet.getRowVisible(row)) continue;
       const cell = worksheet.getCell(row, colIndex);
-      if (!cell || cell.p && (row + 1e3 <= startRowOfViewMain || row - 1e3 >= endRowOfViewMain))
+      if (!cell || cell.p && (row + MEASURE_EXTENT_FOR_PARAGRAPH <= startRowOfViewMain || row - MEASURE_EXTENT_FOR_PARAGRAPH >= endRowOfViewMain))
         continue;
       let measuredWidth = this._getMeasuredWidthByCell(cell, currColWidth);
-      if (cell.fontRenderExtension && (measuredWidth += (((_a10 = cell.fontRenderExtension) == null ? void 0 : _a10.leftOffset) || 0) + (((_b = cell.fontRenderExtension) == null ? void 0 : _b.rightOffset) || 0)), colWidth = Math.max(colWidth, measuredWidth), colWidth >= MAXIMUM_COL_WIDTH)
-        return MAXIMUM_COL_WIDTH;
+      if (cell.fontRenderExtension && (measuredWidth += (((_a10 = cell.fontRenderExtension) == null ? void 0 : _a10.leftOffset) || 0) + (((_b = cell.fontRenderExtension) == null ? void 0 : _b.rightOffset) || 0)), colWidth = Math.max(colWidth, measuredWidth), colWidth >= MAXIMUM_COL_WIDTH) return MAXIMUM_COL_WIDTH;
     }
-    return colWidth === 0 ? currColWidth : colWidth;
+    return colWidth === 0 ? currColWidth : Math.max(MIN_COL_WIDTH, colWidth);
   }
   /**
    * For _calculateColMaxWidth
@@ -25452,8 +25453,7 @@ let SpreadsheetSkeleton = (_a6 = class extends Skeleton {
       ...DEFAULT_CELL_DOCUMENT_MODEL_OPTION,
       ...options
     }, style = this._styles.getStyleByCell(cell);
-    if (!cell)
-      return;
+    if (!cell) return;
     let documentModel, fontString = "document";
     const cellOtherConfig = extractOtherStyle(style), textRotation = ignoreTextRotation ? DEFAULT_STYLES.tr : cellOtherConfig.textRotation || DEFAULT_STYLES.tr;
     let horizontalAlign = cellOtherConfig.horizontalAlign || DEFAULT_STYLES.ht;
@@ -25702,10 +25702,10 @@ let SpreadsheetSkeleton = (_a6 = class extends Skeleton {
       border: new ObjectMatrix()
     }, this._handleBgMatrix.reset(), this._handleBorderMatrix.reset(), this._overflowCache.reset();
   }
-  _makeDocumentSkeletonDirty(row, col) {
-    var _a10;
-    this._stylesCache.fontMatrix != null && ((_a10 = this._stylesCache.fontMatrix.getValue(row, col)) == null || _a10.documentSkeleton.makeDirty(!0));
-  }
+  // private _makeDocumentSkeletonDirty(row: number, col: number): void {
+  //     if (this._stylesCache.fontMatrix == null) return;
+  //     this._stylesCache.fontMatrix.getValue(row, col)?.documentSkeleton.makeDirty(true); ;
+  // }
   _setBorderStylesCache(row, col, style, options) {
     if (!(Tools.isDefine(this._handleBorderMatrix.getValue(row, col)) || !((options == null ? void 0 : options.cacheItem) || { bg: !0, border: !0 }).border) && (this._handleBorderMatrix.setValue(row, col, !0), style && style.bd)) {
       const mergeRange = options == null ? void 0 : options.mergeRange;
@@ -25786,8 +25786,7 @@ let SpreadsheetSkeleton = (_a6 = class extends Skeleton {
    */
   _setMergeBorderProps(type, cache, mergeRange) {
     var _a10;
-    if (!this.worksheet || !cache.border)
-      return;
+    if (!this.worksheet || !cache.border) return;
     const borders = [];
     let isAddBorders = !0, forStart = mergeRange.startRow, forEnd = mergeRange.endRow, row = mergeRange.startRow, column = mergeRange.startColumn;
     type === BORDER_TYPE.TOP ? (row = mergeRange.startRow, forStart = mergeRange.startColumn, forEnd = mergeRange.endColumn) : type === BORDER_TYPE.BOTTOM ? (row = mergeRange.endRow, forStart = mergeRange.startColumn, forEnd = mergeRange.endColumn) : type === BORDER_TYPE.LEFT ? (column = mergeRange.startColumn, forStart = mergeRange.startRow, forEnd = mergeRange.endRow) : type === BORDER_TYPE.RIGHT && (column = mergeRange.endColumn, forStart = mergeRange.startRow, forEnd = mergeRange.endRow);
@@ -25841,12 +25840,6 @@ let SpreadsheetSkeleton = (_a6 = class extends Skeleton {
       color: rgb
     };
   }
-  _getFontFormat(format) {
-    if (!format)
-      return {};
-    const { ff, fs, it, bl, ul, st, ol, cl } = format, style = {};
-    return ff && (style.ff = ff), fs && (style.fs = fs), it && (style.it = it), bl && (style.bl = bl), ul && (style.ul = ul), st && (style.st = st), ol && (style.ol = ol), cl && (style.cl = cl), style;
-  }
   /**
    * New version to get merge data.
    * @param row
@@ -25856,45 +25849,6 @@ let SpreadsheetSkeleton = (_a6 = class extends Skeleton {
   _getCellMergeInfo(row, column) {
     return this.worksheet.getCellInfoInMergeData(row, column);
   }
-  /**
-   * Cache the merged cells on the current screen to improve computational performance.
-   * @param mergeData all marge data
-   * @param range current screen range, include row and column
-   */
-  _getMergeCells(mergeData, range) {
-    const endColumnLast = this.columnWidthAccumulation.length - 1;
-    range ? range = {
-      startRow: range.startRow,
-      endRow: range.endRow,
-      endColumn: endColumnLast,
-      startColumn: 0
-    } : range = { startRow: 0, startColumn: 0, endRow: this.rowHeightAccumulation.length - 1, endColumn: endColumnLast };
-    const { startRow, startColumn, endRow, endColumn } = range, cacheDataMerge = [];
-    for (let i = 0; i < mergeData.length; i++) {
-      const {
-        startRow: mergeStartRow,
-        endRow: mergeEndRow,
-        startColumn: mergeStartColumn,
-        endColumn: mergeEndColumn
-      } = mergeData[i];
-      for (let r = startRow; r <= endRow; r++) {
-        let isBreak = !1;
-        for (let c = startColumn; c <= endColumn; c++)
-          if (r >= mergeStartRow && r <= mergeEndRow && c >= mergeStartColumn && c <= mergeEndColumn) {
-            cacheDataMerge.push({
-              startRow: mergeStartRow,
-              endRow: mergeEndRow,
-              startColumn: mergeStartColumn,
-              endColumn: mergeEndColumn
-            }), isBreak = !0;
-            break;
-          }
-        if (isBreak)
-          break;
-      }
-    }
-    return cacheDataMerge;
-  }
 }, __name(_a6, "SpreadsheetSkeleton"), _a6);
 SpreadsheetSkeleton = __decorateClass$3([
   __decorateParam$3(4, Inject(LocaleService)),
@@ -33565,6 +33519,7 @@ export {
   MAXIMUM_COL_WIDTH,
   MAXIMUM_ROW_HEIGHT,
   MIDDLE_CELL_POS_MAGIC_NUMBER,
+  MIN_COL_WIDTH,
   Marker,
   NORMAL_TEXT_SELECTION_PLUGIN_STYLE,
   ORIENTATION_TYPE,

package/lib/types/basics/const.d.ts

@@ -118,6 +118,7 @@ export declare enum RENDER_CLASS_TYPE {
 }
 export declare const MAXIMUM_ROW_HEIGHT = 2000;
 export declare const MAXIMUM_COL_WIDTH = 2000;
+export declare const MIN_COL_WIDTH = 2;
 export declare const FIX_ONE_PIXEL_BLUR_OFFSET = 0.5;
 export declare const DRAWING_OBJECT_LOWER_LAYER_INDEX = 3;
 export declare const DRAWING_OBJECT_LAYER_INDEX = 4;

package/lib/types/components/sheets/constants.d.ts

@@ -6,3 +6,5 @@ export declare const PRINTING_BG_Z_INDEX = 21;
 export declare const EXPAND_SIZE_FOR_RENDER_OVERFLOW = 20;
 export declare const sheetContentViewportKeys: SHEET_VIEWPORT_KEY[];
 export declare const sheetHeaderViewportKeys: SHEET_VIEWPORT_KEY[];
+export declare const MEASURE_EXTENT = 10000;
+export declare const MEASURE_EXTENT_FOR_PARAGRAPH: number;

package/lib/types/components/sheets/sheet-skeleton.d.ts

@@ -286,7 +286,6 @@ export declare class SpreadsheetSkeleton extends Skeleton {
      * Any changes to sheet model would reset cache.
      */
     private _resetCache;
-    private _makeDocumentSkeletonDirty;
     _setBorderStylesCache(row: number, col: number, style: Nullable<IStyleData>, options: {
         mergeRange?: IRange;
         cacheItem?: ICacheItem;
@@ -310,7 +309,6 @@ export declare class SpreadsheetSkeleton extends Skeleton {
      */
     private _setMergeBorderProps;
     private _setBorderProps;
-    private _getFontFormat;
     /**
      * New version to get merge data.
      * @param row
@@ -318,11 +316,5 @@ export declare class SpreadsheetSkeleton extends Skeleton {
      * @returns {ISelectionCell} The cell info with merge data
      */
     private _getCellMergeInfo;
-    /**
-     * Cache the merged cells on the current screen to improve computational performance.
-     * @param mergeData all marge data
-     * @param range current screen range, include row and column
-     */
-    private _getMergeCells;
 }
 export {};