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

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

@@ -1,7 +1,7 @@
 import { IPosition, BorderStyleTypes } from '@univerjs/core';
 import { UniverRenderingContext } from '../context';
-import { BORDER_TYPE, ORIENTATION_TYPE } from './const';
 import { IDocumentSkeletonLine } from './i-document-skeleton-cached';
+import { BORDER_TYPE as BORDER_LTRB, ORIENTATION_TYPE } from './const';
 import { Vector2 } from './vector2';
 export interface IContext2D extends CanvasRenderingContext2D {
     webkitBackingStorePixelRatio: number;
@@ -18,9 +18,9 @@ export declare function getDevicePixelRatio(): number;
  * @param lineWidthBuffer Solving the problem of mitered corners in the drawing of borders thicker than 2 pixels, caused by the line segments being centered.
  * @param position border draw position
  */
-export declare function drawLineByBorderType(ctx: UniverRenderingContext, type: BORDER_TYPE, lineWidthBuffer: number, position: IPosition): void;
-export declare function drawDiagonalLineByBorderType(ctx: UniverRenderingContext, type: BORDER_TYPE, position: IPosition): void;
-export declare function clearLineByBorderType(ctx: UniverRenderingContext, type: BORDER_TYPE, position: IPosition): void;
+export declare function drawLineByBorderType(ctx: UniverRenderingContext, type: BORDER_LTRB, lineWidthBuffer: number, position: IPosition): void;
+export declare function drawDiagonalLineByBorderType(ctx: UniverRenderingContext, type: BORDER_LTRB, position: IPosition): void;
+export declare function clearLineByBorderType(ctx: UniverRenderingContext, type: BORDER_LTRB, position: IPosition): void;
 export declare function setLineType(ctx: UniverRenderingContext, style: BorderStyleTypes): void;
 export declare function getLineOffset(): number;
 export declare function getLineWith(width: number): number;
@@ -37,8 +37,7 @@ export declare function getRotateOffsetAndFarthestHypotenuse(lines: IDocumentSke
 };
 /**
  * Align the resolution, an alignment needs to be done in special cases where the resolution is 1.5, 1.25, etc.
- * @param pixelRatio devicePixelRatio
- * @returns
+ * @returns {left: number, top: number} offset
  */
 export declare function getTranslateInSpreadContextWithPixelRatio(): {
     left: number;

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

@@ -147,7 +147,7 @@ export declare function inRowViewRanges(ranges: IRange[], rowIndex: number): boo
  * @param {IRange[]} ranges
  */
 export declare function expandRangeIfIntersects(mainRanges: IRange[], ranges: IRange[]): IRange[];
-export declare function clampRanges(range: IRange): {
+export declare function clampRange(range: IRange): {
     startRow: number;
     startColumn: number;
     endRow: number;

package/lib/types/components/docs/doc-component.d.ts

@@ -1,9 +1,9 @@
 import { IDocumentSkeletonGlyph, IDocumentSkeletonLine, IDocumentSkeletonPage, PageLayoutType } from '../../basics/i-document-skeleton-cached';
 import { IBoundRectNoAngle, IViewportInfo } from '../../basics/vector2';
 import { UniverRenderingContext } from '../../context';
-import { RenderComponent } from '../component';
 import { DOCS_EXTENSION_TYPE } from './doc-extension';
 import { DocumentSkeleton } from './layout/doc-skeleton';
+import { RenderComponent } from '../component';
 export interface IPageMarginLayout {
     pageMarginLeft: number;
     pageMarginTop: number;

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/doc-skeleton.d.ts

@@ -1,9 +1,9 @@
 import { LocaleService, Nullable } from '@univerjs/core';
-import { PageLayoutType, IDocumentSkeletonCached, IDocumentSkeletonGlyph, IDocumentSkeletonPage } from '../../../basics/i-document-skeleton-cached';
-import { Skeleton } from '../../skeleton';
-import { DocumentEditArea, DocumentViewModel } from '../view-model/document-view-model';
+import { IDocumentSkeletonCached, IDocumentSkeletonGlyph, IDocumentSkeletonPage, PageLayoutType } from '../../../basics/i-document-skeleton-cached';
 import { INodeInfo, INodePosition, INodeSearch } from '../../../basics/interfaces';
 import { IViewportInfo, Vector2 } from '../../../basics/vector2';
+import { DocumentViewModel, DocumentEditArea } from '../view-model/document-view-model';
+import { Skeleton } from '../../skeleton';
 export declare enum DocumentSkeletonState {
     PENDING = "pending",
     CALCULATING = "calculating",

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

@@ -1,6 +1,6 @@
-import { Registry, IDocumentRenderConfig, IRange, IScale, Nullable } from '@univerjs/core';
+import { IDocumentRenderConfig, IRange, IScale, Nullable, Registry } from '@univerjs/core';
 import { BaseObject } from '../base-object';
-import { Vector2 } from '../basics/vector2';
+import { IBoundRectNoAngle, Vector2 } from '../basics/vector2';
 import { UniverRenderingContext } from '../context';
 export interface IExtensionConfig {
     originTranslate?: Vector2;
@@ -14,6 +14,7 @@ export interface IDrawInfo {
     viewRanges: IRange[];
     viewportKey: string;
     checkOutOfViewBound?: boolean;
+    viewBound?: IBoundRectNoAngle;
 }
 export declare class ComponentExtension<T, U, V> {
     uKey: string;

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

@@ -0,0 +1,20 @@
+/**
+ * Copyright 2023-present DreamNum Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+export declare const BORDER_Z_INDEX = 50;
+export declare const FONT_EXTENSION_Z_INDEX = 45;
+export declare const BG_Z_INDEX = 21;
+export declare const PRINTING_BG_Z_INDEX = 21;
+export declare const EXPAND_SIZE_FOR_RENDER_OVERFLOW = 20;

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

@@ -1,12 +1,26 @@
-import { IRange, IScale } from '@univerjs/core';
-import { SheetExtension } from './sheet-extension';
+import { IRange, IScale, ISelectionCellWithMergeInfo, ObjectMatrix } from '@univerjs/core';
 import { UniverRenderingContext } from '../../../context';
 import { IDrawInfo } from '../../extension';
 import { SpreadsheetSkeleton } from '../sheet-skeleton';
+import { SheetExtension } from './sheet-extension';
+interface IRenderBGContext {
+    ctx: UniverRenderingContext;
+    spreadsheetSkeleton: SpreadsheetSkeleton;
+    backgroundPositions: ObjectMatrix<ISelectionCellWithMergeInfo>;
+    checkOutOfViewBound: boolean;
+    backgroundPaths: Path2D;
+    scaleX: number;
+    scaleY: number;
+    viewRanges: IRange[];
+    diffRanges: IRange[];
+    cellInfo: ISelectionCellWithMergeInfo;
+}
 export declare class Background extends SheetExtension {
     uKey: string;
     Z_INDEX: number;
     PRINTING_Z_INDEX: number;
     get zIndex(): number;
     draw(ctx: UniverRenderingContext, _parentScale: IScale, spreadsheetSkeleton: SpreadsheetSkeleton, diffRanges: IRange[], { viewRanges, checkOutOfViewBound }: IDrawInfo): void;
+    renderBGByCell(bgContext: IRenderBGContext, row: number, col: number): true | undefined;
 }
+export {};

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

@@ -1,10 +1,24 @@
-import { IRange, IScale } from '@univerjs/core';
-import { SheetExtension } from './sheet-extension';
+import { IRange, IScale, ObjectMatrix, BorderStyleTypes } from '@univerjs/core';
 import { UniverRenderingContext } from '../../../context';
+import { IDrawInfo } from '../../extension';
+import { BorderCache } from '../interfaces';
 import { SpreadsheetSkeleton } from '../sheet-skeleton';
+import { SheetExtension } from './sheet-extension';
+interface IRenderBorderContext {
+    ctx: UniverRenderingContext;
+    overflowCache: ObjectMatrix<IRange>;
+    precisionScale: number;
+    spreadsheetSkeleton: SpreadsheetSkeleton;
+    diffRanges: IRange[];
+    viewRanges: IRange[];
+}
 export declare class Border extends SheetExtension {
     uKey: string;
     Z_INDEX: number;
-    draw(ctx: UniverRenderingContext, _parentScale: IScale, spreadsheetSkeleton: SpreadsheetSkeleton, diffRanges: IRange[]): void;
+    preStyle: BorderStyleTypes;
+    preColor: string;
+    draw(ctx: UniverRenderingContext, _parentScale: IScale, spreadsheetSkeleton: SpreadsheetSkeleton, diffRanges: IRange[], { viewRanges }: IDrawInfo): void;
+    renderBorderByCell(renderBorderContext: IRenderBorderContext, row: number, col: number, borderCacheItem: BorderCache): true | undefined;
     private _getOverflowExclusion;
 }
+export {};

package/lib/types/components/sheets/extensions/column-header-layout.d.ts

@@ -1,7 +1,7 @@
 import { IScale } from '@univerjs/core';
 import { UniverRenderingContext } from '../../../context';
-import { SpreadsheetSkeleton } from '../sheet-skeleton';
 import { IAColumnCfg, IAColumnCfgObj, IColumnStyleCfg } from '../interfaces';
+import { SpreadsheetSkeleton } from '../sheet-skeleton';
 import { SheetExtension } from './sheet-extension';
 export interface IColumnsHeaderCfgParam {
     headerStyle?: Partial<IColumnStyleCfg>;

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

@@ -1,13 +1,36 @@
-import { IRange, IScale } from '@univerjs/core';
-import { SpreadsheetSkeleton } from '../sheet-skeleton';
-import { SheetExtension } from './sheet-extension';
+import { ICellDataForSheetInterceptor, IRange, IScale, ISelectionCellWithMergeInfo, Nullable, ObjectMatrix } from '@univerjs/core';
 import { UniverRenderingContext } from '../../../context';
 import { IDrawInfo } from '../../extension';
+import { IFontCacheItem } from '../interfaces';
+import { SpreadsheetSkeleton } from '../sheet-skeleton';
+import { SheetExtension } from './sheet-extension';
+interface IRenderFontContext {
+    ctx: UniverRenderingContext;
+    scale: number;
+    rowHeightAccumulation: number[];
+    columnTotalWidth: number;
+    columnWidthAccumulation: number[];
+    rowTotalHeight: number;
+    viewRanges: IRange[];
+    checkOutOfViewBound: boolean;
+    diffRanges: IRange[];
+    spreadsheetSkeleton: SpreadsheetSkeleton;
+    overflowRectangle: Nullable<IRange>;
+    cellData: ICellDataForSheetInterceptor;
+    startY: number;
+    endY: number;
+    startX: number;
+    endX: number;
+    cellInfo: ISelectionCellWithMergeInfo;
+}
 export declare class Font extends SheetExtension {
     uKey: string;
     Z_INDEX: number;
     getDocuments(): any;
     draw(ctx: UniverRenderingContext, parentScale: IScale, spreadsheetSkeleton: SpreadsheetSkeleton, diffRanges: IRange[], moreBoundsInfo: IDrawInfo): void;
+    renderFontEachCell(renderFontContext: IRenderFontContext, row: number, col: number, fontMatrix: ObjectMatrix<IFontCacheItem>): true | undefined;
+    private _clipTextOverflow;
     private _renderDocuments;
     private _clipRectangleForOverflow;
 }
+export {};

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

@@ -1,5 +1,5 @@
 import { BorderStyleTypes, HorizontalAlign, ISelectionCellWithMergeInfo, ObjectMatrix, VerticalAlign, WrapStrategy } from '@univerjs/core';
-import { BORDER_TYPE } from '../../basics/const';
+import { BORDER_TYPE as BORDER_LTRB } from '../../basics/const';
 import { Canvas } from '../../canvas';
 import { UniverRenderingContext } from '../../context';
 import { DocumentSkeleton } from '../docs/layout/doc-skeleton';
@@ -7,7 +7,7 @@ export interface BorderCache {
     [key: string]: BorderCacheItem | {};
 }
 export interface BorderCacheItem {
-    type: BORDER_TYPE;
+    type: BORDER_LTRB;
     style: BorderStyleTypes;
     color: string;
 }

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

@@ -51,7 +51,7 @@ export declare class SpreadsheetSkeleton extends Skeleton {
     /**
      * Range of visible area(range in viewBounds)
      */
-    private _rowColumnSegment;
+    private _visibleRange;
     private _overflowCache;
     private _stylesCache;
     /** A matrix to store if a (row, column) position has render cache. */
@@ -78,6 +78,7 @@ export declare class SpreadsheetSkeleton extends Skeleton {
      * Range of visible area(range in viewBounds)
      */
     get rowColumnSegment(): IRowColumnRange;
+    get visibleArea(): IRowColumnRange;
     get stylesCache(): IStylesCache;
     get overflowCache(): ObjectMatrix<IRange>;
     get showGridlines(): BooleanNumber;
@@ -201,6 +202,12 @@ export declare class SpreadsheetSkeleton extends Skeleton {
      * @param column Specified Column Coordinate
      */
     getCellByIndex(row: number, column: number): ISelectionCellWithMergeInfo;
+    /**
+     * New merge info, but position without header.
+     * @param row
+     * @param column
+     * @returns {ISelectionCellWithMergeInfo} cellInfo with merge info
+     */
     getCellByIndexWithNoHeader(row: number, column: number): ISelectionCellWithMergeInfo;
     convertTransformToOffsetX(offsetX: number, scaleX: number, scrollXY: {
         x: number;
@@ -246,7 +253,6 @@ 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
      */

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

@@ -1,7 +1,4 @@
 import { IRange } from '@univerjs/core';
-import { Documents } from '../docs/document';
-import { IPaintForRefresh, IPaintForScrolling, SHEET_VIEWPORT_KEY } from './interfaces';
-import { SheetComponent } from './sheet-component';
 import { IBoundRectNoAngle, IViewportInfo, Vector2 } from '../../basics/vector2';
 import { Canvas } from '../../canvas';
 import { UniverRenderingContext2D } from '../../context';
@@ -10,6 +7,9 @@ import { Background } from './extensions/background';
 import { Border } from './extensions/border';
 import { Font } from './extensions/font';
 import { SpreadsheetSkeleton } from './sheet-skeleton';
+import { Documents } from '../docs/document';
+import { IPaintForRefresh, IPaintForScrolling, SHEET_VIEWPORT_KEY } from './interfaces';
+import { SheetComponent } from './sheet-component';
 export declare class Spreadsheet extends SheetComponent {
     private _allowCache;
     private _backgroundExtension;

package/lib/types/context.d.ts

@@ -17,6 +17,7 @@ export declare class UniverRenderingContext2D implements CanvasRenderingContext2
     __mode: string;
     private _system;
     private _browser;
+    private _transformCache;
     readonly canvas: HTMLCanvasElement;
     _context: CanvasRenderingContext2D;
     private _systemType;

package/lib/types/engine.d.ts

@@ -1,10 +1,10 @@
-import { Observable, Subject } from 'rxjs';
-import { Canvas, CanvasRenderMode } from './canvas';
-import { ThinEngine } from './thin-engine';
 import { CURSOR_TYPE } from './basics/const';
 import { ITimeMetric } from './basics/interfaces';
 import { IBasicFrameInfo } from './basics/performance-monitor';
 import { Scene } from './scene';
+import { Observable, Subject } from 'rxjs';
+import { Canvas, CanvasRenderMode } from './canvas';
+import { ThinEngine } from './thin-engine';
 export declare class Engine extends ThinEngine<Scene> {
     renderEvenInBackground: boolean;
     private readonly _beginFrame$;

package/lib/types/scene.d.ts

@@ -1,8 +1,4 @@
 import { Nullable } from '@univerjs/core';
-import { CURSOR_TYPE } from './basics/const';
-import { Layer } from './layer';
-import { Transformer } from './scene.transformer';
-import { ThinScene } from './thin-scene';
 import { BaseObject } from './base-object';
 import { IDragEvent, IKeyboardEvent, IMouseEvent, IPointerEvent, IWheelEvent } from './basics/i-events';
 import { ISceneTransformState } from './basics/interfaces';
@@ -14,6 +10,10 @@ import { Engine } from './engine';
 import { SceneViewer } from './scene-viewer';
 import { ThinEngine } from './thin-engine';
 import { Viewport } from './viewport';
+import { CURSOR_TYPE } from './basics/const';
+import { Layer } from './layer';
+import { Transformer } from './scene.transformer';
+import { ThinScene } from './thin-scene';
 export declare class Scene extends ThinScene {
     private _parent;
     private _layers;
@@ -24,6 +24,8 @@ export declare class Scene extends ThinScene {
     readonly addObject$: import('rxjs').Observable<Scene>;
     private _beforeRender$;
     readonly beforeRender$: import('rxjs').Observable<Nullable<Canvas>>;
+    private _afterRender$;
+    readonly afterRender$: 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/thin-engine.d.ts

@@ -1,4 +1,4 @@
-import { Disposable, EventSubject, IDisposable } from '@univerjs/core';
+import { IDisposable, Disposable, EventSubject } from '@univerjs/core';
 import { CURSOR_TYPE, RENDER_CLASS_TYPE } from './basics/const';
 import { IEvent } from './basics/i-events';
 import { ITransformChangeState } from './basics/interfaces';

package/lib/types/viewport.d.ts

@@ -1,11 +1,11 @@
-import { EventSubject, EventState, IPosition, Nullable } from '@univerjs/core';
-import { Transform } from './basics/transform';
-import { Vector2, IBoundRectNoAngle, IViewportInfo } from './basics/vector2';
+import { EventState, IPosition, Nullable, EventSubject } from '@univerjs/core';
 import { BaseObject } from './base-object';
 import { IWheelEvent } from './basics/i-events';
+import { IBoundRectNoAngle, IViewportInfo, Vector2 } from './basics/vector2';
 import { UniverRenderingContext } from './context';
 import { BaseScrollBar } from './shape/base-scroll-bar';
 import { ThinScene } from './thin-scene';
+import { Transform } from './basics/transform';
 interface IViewPosition {
     top?: number;
     left?: number;
@@ -348,7 +348,7 @@ export declare class Viewport {
      * Update scroll when viewport is resizing and removing rol & col
      */
     private _updateScrollByViewportScrollValue;
-    private _getViewPortSize;
+    private _calcViewPortSize;
     /**
      * update pre scroll value has handled in updateScroll()
      */