@univerjs/engine-render 0.2.15 → 0.3.0-alpha.1

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

@@ -13,11 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+export * from '../components/docs/layout/shaping-engine/font-cache';
 export * from './cell-data';
 export * from './const';
 export * from './document-node-tools';
 export * from './draw';
-export * from '../components/docs/layout/shaping-engine/font-cache';
+export * from './group-transform';
 export * from './i-document-skeleton-cached';
 export * from './i-events';
 export * from './interfaces';
@@ -25,8 +26,7 @@ export * from './path2';
 export * from './performance-monitor';
 export * from './range';
 export * from './scroll-xy';
+export * from './text-rotation';
 export * from './tools';
 export * from './transform';
 export * from './vector2';
-export * from './text-rotation';
-export * from './group-transform';

package/lib/types/components/docs/document.d.ts

@@ -1,9 +1,9 @@
 import { Nullable } from '@univerjs/core';
+import { DocComponent, IDocumentsConfig, IPageMarginLayout } from './doc-component';
 import { IDocumentSkeletonPage } from '../../basics/i-document-skeleton-cached';
 import { Transform } from '../../basics/transform';
 import { IViewportInfo } from '../../basics/vector2';
 import { UniverRenderingContext } from '../../context';
-import { IDocumentsConfig, IPageMarginLayout, DocComponent } from './doc-component';
 import { DocumentSkeleton } from './layout/doc-skeleton';
 export interface IPageRenderConfig {
     page: IDocumentSkeletonPage;

package/lib/types/components/docs/layout/block/paragraph/line-adjustment.d.ts

@@ -1,5 +1,5 @@
+import { ISectionBreakConfig } from '../../../../../basics';
 import { IDocumentSkeletonPage } from '../../../../../basics/i-document-skeleton-cached';
-import { DocumentViewModel } from '../../../view-model/document-view-model';
 import { DataStreamTreeNode } from '../../../view-model/data-stream-tree-node';
-import { ISectionBreakConfig } from '../../../../../basics';
+import { DocumentViewModel } from '../../../view-model/document-view-model';
 export declare function lineAdjustment(pages: IDocumentSkeletonPage[], viewModel: DocumentViewModel, paragraphNode: DataStreamTreeNode, sectionBreakConfig: ISectionBreakConfig): void;

package/lib/types/components/docs/layout/block/paragraph/linebreaking.d.ts

@@ -1,8 +1,8 @@
 import { Nullable } from '@univerjs/core';
 import { IDocumentSkeletonPage, IDocumentSkeletonTable } from '../../../../../basics/i-document-skeleton-cached';
-import { ILayoutContext } from '../../tools';
-import { DataStreamTreeNode } from '../../../view-model/data-stream-tree-node';
 import { ISectionBreakConfig } from '../../../../../basics/interfaces';
+import { DataStreamTreeNode } from '../../../view-model/data-stream-tree-node';
 import { DocumentViewModel } from '../../../view-model/document-view-model';
+import { ILayoutContext } from '../../tools';
 import { IShapedText } from './shaping';
 export declare function lineBreaking(ctx: ILayoutContext, viewModel: DocumentViewModel, shapedTextList: IShapedText[], curPage: IDocumentSkeletonPage, paragraphNode: DataStreamTreeNode, sectionBreakConfig: ISectionBreakConfig, tableSkeleton: Nullable<IDocumentSkeletonTable>): IDocumentSkeletonPage[];

package/lib/types/components/docs/layout/block/paragraph/paragraph-layout.d.ts

@@ -1,6 +1,6 @@
 import { IDocumentSkeletonPage } from '../../../../../basics/i-document-skeleton-cached';
 import { ISectionBreakConfig } from '../../../../../basics/interfaces';
-import { ILayoutContext } from '../../tools';
 import { DataStreamTreeNode } from '../../../view-model/data-stream-tree-node';
 import { DocumentViewModel } from '../../../view-model/document-view-model';
+import { ILayoutContext } from '../../tools';
 export declare function dealWidthParagraph(ctx: ILayoutContext, viewModel: DocumentViewModel, paragraphNode: DataStreamTreeNode, curPage: IDocumentSkeletonPage, sectionBreakConfig: ISectionBreakConfig): IDocumentSkeletonPage[];

package/lib/types/components/docs/layout/block/paragraph/shaping.d.ts

@@ -1,9 +1,9 @@
+import { BreakPointType } from '../../line-breaker/break';
 import { IDocumentSkeletonGlyph } from '../../../../../basics/i-document-skeleton-cached';
-import { ILayoutContext } from '../../tools';
+import { ISectionBreakConfig } from '../../../../../basics/interfaces';
 import { DataStreamTreeNode } from '../../../view-model/data-stream-tree-node';
 import { DocumentViewModel } from '../../../view-model/document-view-model';
-import { ISectionBreakConfig } from '../../../../../basics/interfaces';
-import { BreakPointType } from '../../line-breaker/break';
+import { ILayoutContext } from '../../tools';
 export interface IShapedText {
     text: string;
     glyphs: IDocumentSkeletonGlyph[];

package/lib/types/components/docs/layout/doc-skeleton.d.ts

@@ -28,6 +28,10 @@ export declare class DocumentSkeleton extends Skeleton {
     static create(docViewModel: DocumentViewModel, localeService: LocaleService): DocumentSkeleton;
     dispose(): void;
     getViewModel(): DocumentViewModel;
+    /**
+     * Layout the document.
+     * PS: This method has significant impact on performance.
+     */
     calculate(bounds?: IViewportInfo): void;
     getSkeletonData(): Nullable<IDocumentSkeletonCached>;
     getActualSize(): {

package/lib/types/components/docs/layout/tools.d.ts

@@ -1,4 +1,4 @@
-import { BooleanNumber, GridType, SpacingRule, DocumentDataModel, INumberUnit, IObjectPositionH, IObjectPositionV, IParagraph, IParagraphStyle, ITextStyle, Nullable } from '@univerjs/core';
+import { DocumentDataModel, INumberUnit, IObjectPositionH, IObjectPositionV, IParagraph, IParagraphStyle, ITextStyle, Nullable, BooleanNumber, GridType, SpacingRule } from '@univerjs/core';
 import { IDocumentSkeletonCached, IDocumentSkeletonColumn, IDocumentSkeletonDivide, IDocumentSkeletonDrawing, IDocumentSkeletonFontStyle, IDocumentSkeletonGlyph, IDocumentSkeletonLine, IDocumentSkeletonPage, IDocumentSkeletonSection, ISkeletonResourceReference } from '../../../basics/i-document-skeleton-cached';
 import { IDocsConfig, IParagraphConfig, ISectionBreakConfig } from '../../../basics/interfaces';
 import { DataStreamTreeNode } from '../view-model/data-stream-tree-node';

package/lib/types/components/extension.d.ts

@@ -1,4 +1,4 @@
-import { IDocumentRenderConfig, IRange, IScale, Nullable, Registry } from '@univerjs/core';
+import { Registry, IDocumentRenderConfig, IRange, IScale, Nullable } from '@univerjs/core';
 import { BaseObject } from '../base-object';
 import { Vector2 } from '../basics/vector2';
 import { UniverRenderingContext } from '../context';

package/lib/types/components/index.d.ts

@@ -16,6 +16,6 @@
 export * from './component';
 export * from './extension';
 export * from './sheets';
-export * from './skeleton';
 export { RENDER_RAW_FORMULA_KEY } from './sheets/sheet-skeleton';
+export * from './skeleton';
 export * from './slides';

package/lib/types/components/sheets/extensions/index.d.ts

@@ -16,8 +16,8 @@
 export * from './background';
 export * from './border';
 export * from './column-header-layout';
+export * from './custom';
 export * from './font';
+export * from './marker';
 export * from './row-header-layout';
 export * from './sheet-extension';
-export * from './marker';
-export * from './custom';

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

@@ -1,8 +1,8 @@
 import { BorderStyleTypes, HorizontalAlign, ISelectionCellWithMergeInfo, ObjectMatrix, VerticalAlign, WrapStrategy } from '@univerjs/core';
 import { BORDER_TYPE } from '../../basics/const';
-import { DocumentSkeleton } from '../docs/layout/doc-skeleton';
 import { Canvas } from '../../canvas';
 import { UniverRenderingContext } from '../../context';
+import { DocumentSkeleton } from '../docs/layout/doc-skeleton';
 export interface BorderCache {
     [key: string]: BorderCacheItem | {};
 }
@@ -19,12 +19,12 @@ export interface IFontCacheItem {
     horizontalAlign: HorizontalAlign;
     wrapStrategy: WrapStrategy;
 }
-type backgroundCache = Record<string, ObjectMatrix<string>>;
-type fontCache = Record<string, ObjectMatrix<IFontCacheItem>>;
+type colorString = string;
 export interface IStylesCache {
-    background?: backgroundCache;
+    background?: Record<colorString, ObjectMatrix<string>>;
     backgroundPositions?: ObjectMatrix<ISelectionCellWithMergeInfo>;
-    font?: fontCache;
+    font?: Record<string, ObjectMatrix<IFontCacheItem>>;
+    fontMatrix: ObjectMatrix<IFontCacheItem>;
     border?: ObjectMatrix<BorderCache>;
 }
 export declare enum ShowGridlinesState {

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, 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,7 +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 _cellBgAndBorderCache;
+    private _handleBgMatrix;
+    private _handleBorderMatrix;
+    private _handleFontMatrix;
     private _showGridlines;
     private _marginTop;
     private _marginLeft;
@@ -211,6 +213,13 @@ export declare class SpreadsheetSkeleton extends Skeleton {
     getSelectionMergeBounding(startRow: number, startColumn: number, endRow: number, endColumn: number): IRange;
     getBlankCellDocumentModel(cell: Nullable<ICellData>): IDocumentLayoutObject;
     getCellDocumentModelWithFormula(cell: ICellData): Nullable<IDocumentLayoutObject>;
+    /**
+     * This method generates a document model based on the cell's properties and handles the associated styles and configurations.
+     * If the cell does not exist, it will return null.
+     * PS: This method has significant impact on performance.
+     * @param cell
+     * @param options
+     */
     private _getCellDocumentModel;
     getDecomposedOffset(offsetX: number, offsetY: number): {
         row: number;
@@ -237,19 +246,29 @@ export declare class SpreadsheetSkeleton extends Skeleton {
     private _getOverflowBound;
     intersectMergeRange(row: number, column: number): boolean;
     /**
+     * @deprecated use _getCellMergeInfo instead.
      * get the current row and column segment visible merge data
      * @returns {IRange} The visible merge data
      */
     getCurrentRowColumnSegmentMergeData(range?: IRange): IRange[];
     private _calculateStylesCache;
+    resetCache(): void;
     /**
      * Any changes to sheet model would reset cache.
      */
     private _resetCache;
-    resetCache(): void;
     private _makeDocumentSkeletonDirty;
+    _setBorderStylesCache(row: number, col: number, style: Nullable<IStyleData>, options: {
+        mergeRange?: IRange;
+        cacheItem?: ICacheItem;
+    } | undefined): void;
+    _setBgStylesCache(row: number, col: number, style: Nullable<IStyleData>, options: {
+        mergeRange?: IRange;
+        cacheItem?: ICacheItem;
+    } | undefined): void;
+    _setFontStylesCache(row: number, col: number, cell: Nullable<ICellData>): void;
     /**
-     * Set border background and font to this._stylesCache { border font background }
+     * Set border background and font to this._stylesCache
      * @param row {number}
      * @param col {number}
      * @param options {{ mergeRange: IRange; cacheItem: ICacheItem } | undefined}
@@ -265,6 +284,12 @@ export declare class SpreadsheetSkeleton extends Skeleton {
     private _setBorderProps;
     private _getFontFormat;
     private _getOtherStyle;
+    /**
+     * New version to get merge data.
+     * @param row
+     * @param column
+     * @returns {ISelectionCell} The cell info with merge data
+     */
     private _getCellMergeInfo;
     /**
      * Cache the merged cells on the current screen to improve computational performance.

package/lib/types/scene.d.ts

@@ -8,6 +8,7 @@ import { IDragEvent, IKeyboardEvent, IMouseEvent, IPointerEvent, IWheelEvent } f
 import { ISceneTransformState } from './basics/interfaces';
 import { ITransformerConfig } from './basics/transformer-config';
 import { Vector2 } from './basics/vector2';
+import { Canvas } from './canvas';
 import { UniverRenderingContext } from './context';
 import { Engine } from './engine';
 import { SceneViewer } from './scene-viewer';
@@ -21,6 +22,8 @@ export declare class Scene extends ThinScene {
     private _defaultCursor;
     private _addObject$;
     readonly addObject$: import('rxjs').Observable<Scene>;
+    private _beforeRender$;
+    readonly beforeRender$: import('rxjs').Observable<Nullable<Canvas>>;
     /**
      * Transformer constructor.  Transformer is a special type of group that allow you transform
      * primitives and shapes. Transforming tool is not changing `width` and `height` properties of nodes

package/lib/types/shape/index.d.ts

@@ -13,15 +13,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+export * from './checkbox';
 export * from './circle';
 export * from './control';
+export * from './dashedrect';
 export * from './drawing';
-export * from './path';
 export * from './image';
+export * from './path';
 export * from './rect';
 export * from './regular-polygon';
 export * from './rich-text';
 export * from './scroll-bar';
 export * from './shape';
-export * from './checkbox';
-export * from './dashedrect';