@univerjs/engine-render 0.3.0-alpha.0 → 0.3.0

package/lib/es/index.js

@@ -24586,8 +24586,9 @@ let SpreadsheetSkeleton = (_a6 = class extends Skeleton {
       border: new ObjectMatrix()
     });
     /** A matrix to store if a (row, column) position has render cache. */
-    __publicField(this, "_cellBgCacheMatrix", new ObjectMatrix());
-    __publicField(this, "_cellBorderCacheMatrix", new ObjectMatrix());
+    __publicField(this, "_handleBgMatrix", new ObjectMatrix());
+    __publicField(this, "_handleBorderMatrix", new ObjectMatrix());
+    __publicField(this, "_handleFontMatrix", new ObjectMatrix());
     __publicField(this, "_showGridlines", BooleanNumber.TRUE);
     __publicField(this, "_marginTop", 0);
     __publicField(this, "_marginLeft", 0);
@@ -24651,7 +24652,7 @@ let SpreadsheetSkeleton = (_a6 = class extends Skeleton {
       font: {},
       fontMatrix: new ObjectMatrix(),
       border: new ObjectMatrix()
-    }, this._cellBgCacheMatrix.reset(), this._cellBorderCacheMatrix.reset(), this._overflowCache.reset(), this._worksheetData = null, this._cellData = null, this._styles = null;
+    }, this._handleBgMatrix.reset(), this._handleBorderMatrix.reset(), this._overflowCache.reset(), this._worksheetData = null, this._cellData = null, this._styles = null;
   }
   /**
    * @deprecated should never expose a property that is provided by another module!
@@ -25383,29 +25384,29 @@ let SpreadsheetSkeleton = (_a6 = class extends Skeleton {
       font: {},
       fontMatrix: new ObjectMatrix(),
       border: new ObjectMatrix()
-    }, this._cellBgCacheMatrix.reset(), this._cellBorderCacheMatrix.reset(), this._overflowCache.reset();
+    }, 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));
   }
   _setBorderStylesCache(row, col, style, options) {
-    if (!(!((options == null ? void 0 : options.cacheItem) || { bg: !0, border: !0 }).border || Tools.isDefine(this._cellBorderCacheMatrix.getValue(row, col))) && (this._cellBorderCacheMatrix.setValue(row, col, !0), style && style.bd)) {
+    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;
       mergeRange ? (this._setMergeBorderProps(BORDER_TYPE.TOP, this._stylesCache, mergeRange), this._setMergeBorderProps(BORDER_TYPE.BOTTOM, this._stylesCache, mergeRange), this._setMergeBorderProps(BORDER_TYPE.LEFT, this._stylesCache, mergeRange), this._setMergeBorderProps(BORDER_TYPE.RIGHT, this._stylesCache, mergeRange)) : this.intersectMergeRange(row, col) || (this._setBorderProps(row, col, BORDER_TYPE.TOP, style, this._stylesCache), this._setBorderProps(row, col, BORDER_TYPE.BOTTOM, style, this._stylesCache), this._setBorderProps(row, col, BORDER_TYPE.LEFT, style, this._stylesCache), this._setBorderProps(row, col, BORDER_TYPE.RIGHT, style, this._stylesCache)), this._setBorderProps(row, col, BORDER_TYPE.TL_BR, style, this._stylesCache), this._setBorderProps(row, col, BORDER_TYPE.TL_BC, style, this._stylesCache), this._setBorderProps(row, col, BORDER_TYPE.TL_MR, style, this._stylesCache), this._setBorderProps(row, col, BORDER_TYPE.BL_TR, style, this._stylesCache), this._setBorderProps(row, col, BORDER_TYPE.ML_TR, style, this._stylesCache), this._setBorderProps(row, col, BORDER_TYPE.BC_TR, style, this._stylesCache);
     }
   }
   _setBgStylesCache(row, col, style, options) {
     var _a10;
-    if (!(!((options == null ? void 0 : options.cacheItem) || { bg: !0, border: !0 }).bg || Tools.isDefine(this._cellBgCacheMatrix.getValue(row, col))) && (this._cellBgCacheMatrix.setValue(row, col, !0), style && style.bg && style.bg.rgb)) {
+    if (!(Tools.isDefine(this._handleBgMatrix.getValue(row, col)) || !((options == null ? void 0 : options.cacheItem) || { bg: !0, border: !0 }).bg) && (this._handleBgMatrix.setValue(row, col, !0), style && style.bg && style.bg.rgb)) {
       const rgb = style.bg.rgb;
       this._stylesCache.background[rgb] || (this._stylesCache.background[rgb] = new ObjectMatrix()), this._stylesCache.background[rgb].setValue(row, col, rgb);
       const cellInfo = this.getCellByIndexWithNoHeader(row, col);
       (_a10 = this._stylesCache.backgroundPositions) == null || _a10.setValue(row, col, cellInfo);
     }
   }
-  _setFontStylesCache(cell, row, col) {
-    if (isNullCell(cell) || this._stylesCache.fontMatrix.getValue(row, col)) return;
+  _setFontStylesCache(row, col, cell) {
+    if (isNullCell(cell) || (this._handleFontMatrix.setValue(row, col, !0), this._stylesCache.fontMatrix.getValue(row, col))) return;
     const modelObject = this._getCellDocumentModel(cell, {
       displayRawFormula: this._renderRawFormula
     });
@@ -25436,8 +25437,9 @@ let SpreadsheetSkeleton = (_a6 = class extends Skeleton {
   _setStylesCache(row, col, options) {
     if (row === -1 || col === -1)
       return;
-    const cell = this.worksheet.getCell(row, col) || this.worksheet.getCellRaw(row, col);
-    if (!cell) return;
+    const handledBgCell = Tools.isDefine(this._handleBgMatrix.getValue(row, col)), handledBorderCell = Tools.isDefine(this._handleBorderMatrix.getValue(row, col));
+    if (handledBgCell && handledBorderCell)
+      return;
     options || (options = { cacheItem: { bg: !0, border: !0 } });
     const { isMerged, isMergedMainCell, startRow, startColumn, endRow, endColumn } = this._getCellMergeInfo(row, col);
     if (options && (options.mergeRange = { startRow, startColumn, endRow, endColumn }), this.worksheet.getColVisible(col) === !1 || this.worksheet.getRowVisible(row) === !1) {
@@ -25446,8 +25448,8 @@ let SpreadsheetSkeleton = (_a6 = class extends Skeleton {
       if (!isMergedMainCell)
         return;
     }
-    const style = this._styles.getStyleByCell(cell);
-    this._setBgStylesCache(row, col, style, options), this._setBorderStylesCache(row, col, style, options), this._setFontStylesCache(cell, row, col);
+    const cell = this.worksheet.getCell(row, col) || this.worksheet.getCellRaw(row, col), style = this._styles.getStyleByCell(cell);
+    this._setBgStylesCache(row, col, style, options), this._setBorderStylesCache(row, col, style, options), this._setFontStylesCache(row, col, cell);
   }
   _updateConfigAndGetDocumentModel(documentData, horizontalAlign, paddingData, renderConfig) {
     var _a10, _b, _c, _d, _e;

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

@@ -1,8 +1,8 @@
-import { BooleanNumber, DocumentDataModel, HorizontalAlign, IContextService, LocaleService, ObjectMatrix, VerticalAlign, WrapStrategy, ICellData, IColumnRange, IPaddingData, IPosition, IRange, IRowAutoHeightInfo, IRowRange, ISelectionCellWithMergeInfo, ISize, IStyleData, ITextRotation, IWorksheetData, Nullable, Styles, Worksheet } from '@univerjs/core';
-import { DocumentSkeleton } from '../docs/layout/doc-skeleton';
-import { Skeleton } from '../skeleton';
+import { ICellData, IColumnRange, IPaddingData, IPosition, IRange, IRowAutoHeightInfo, IRowRange, ISelectionCellWithMergeInfo, ISize, IStyleData, ITextRotation, IWorksheetData, Nullable, Styles, Worksheet, BooleanNumber, DocumentDataModel, HorizontalAlign, IContextService, LocaleService, ObjectMatrix, VerticalAlign, WrapStrategy } from '@univerjs/core';
 import { IBoundRectNoAngle, IViewportInfo } from '../../basics/vector2';
 import { IFontCacheItem, IStylesCache } from './interfaces';
+import { DocumentSkeleton } from '../docs/layout/doc-skeleton';
+import { Skeleton } from '../skeleton';
 /**
  * Obtain the height and width of a cell's text, taking into account scenarios with rotated text.
  * @param documentSkeleton Data of the document's ViewModel
@@ -55,8 +55,9 @@ export declare class SpreadsheetSkeleton extends Skeleton {
     private _overflowCache;
     private _stylesCache;
     /** A matrix to store if a (row, column) position has render cache. */
-    private _cellBgCacheMatrix;
-    private _cellBorderCacheMatrix;
+    private _handleBgMatrix;
+    private _handleBorderMatrix;
+    private _handleFontMatrix;
     private _showGridlines;
     private _marginTop;
     private _marginLeft;
@@ -265,7 +266,7 @@ export declare class SpreadsheetSkeleton extends Skeleton {
         mergeRange?: IRange;
         cacheItem?: ICacheItem;
     } | undefined): void;
-    _setFontStylesCache(cell: Nullable<ICellData>, row: number, col: number): void;
+    _setFontStylesCache(row: number, col: number, cell: Nullable<ICellData>): void;
     /**
      * Set border background and font to this._stylesCache
      * @param row {number}