@univerjs/engine-render 0.7.0 → 0.8.0-beta.1

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

@@ -42,7 +42,7 @@ export declare function precisionTo(num: number, accurate: number): number;
  * var time = performance.now(); for(let i=0;i<100000000;i++){ fixLineWidthByScale(i, 0.666); }; console.log(performance.now()-time);
  */
 export declare function fixLineWidthByScale(num: number, scale: number): number;
-export declare function getFontStyleString(textStyle?: IStyleBase): IDocumentSkeletonFontStyle;
+export declare function getFontStyleString(textStyle?: Nullable<IStyleBase>): IDocumentSkeletonFontStyle;
 export declare function hasCJKText(text: string): boolean;
 export declare function hasCJK(text: string): boolean;
 export declare function hasCJKPunctuation(text: string): boolean;

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

@@ -0,0 +1,38 @@
+/**
+ * Copyright 2023-present DreamNum Co., Ltd.
+ *
+ * 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 interface ILineInfo {
+    text: string;
+    width: number;
+    height: number;
+    baseline: number;
+}
+export declare class DocSimpleSkeleton {
+    private _text;
+    private _fontStyle;
+    private _warp;
+    private _width;
+    private _height;
+    private _lineBreaker;
+    private _lines;
+    private _dirty;
+    private _lastBreakLength;
+    constructor(_text: string, _fontStyle: string, _warp: boolean, _width: number, _height: number);
+    calculate(): ILineInfo[];
+    getLines(): ILineInfo[];
+    getTotalHeight(): number;
+    getTotalWidth(): number;
+    makeDirty(): void;
+}

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

@@ -51,6 +51,7 @@ export declare class Font extends SheetExtension {
      * @param fontCache
      */
     private _clipByRenderBounds;
+    private _renderText;
     private _renderDocuments;
     private _clipRectangleForOverflow;
 }

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

@@ -1,4 +1,4 @@
-import { BorderStyleTypes, HorizontalAlign, ICellDataForSheetInterceptor, ICellWithCoord, ImageCacheMap, Nullable, ObjectMatrix, VerticalAlign, WrapStrategy } from '@univerjs/core';
+import { BorderStyleTypes, HorizontalAlign, ICellDataForSheetInterceptor, ICellWithCoord, ImageCacheMap, IStyleData, Nullable, ObjectMatrix, VerticalAlign, WrapStrategy } from '@univerjs/core';
 import { BORDER_TYPE as BORDER_LTRB } from '../../basics/const';
 import { Canvas } from '../../canvas';
 import { UniverRenderingContext } from '../../context';
@@ -12,7 +12,7 @@ export interface BorderCacheItem {
     color: string;
 }
 export interface IFontCacheItem {
-    documentSkeleton: DocumentSkeleton;
+    documentSkeleton?: DocumentSkeleton;
     vertexAngle?: number;
     centerAngle?: number;
     verticalAlign: VerticalAlign;
@@ -20,12 +20,13 @@ export interface IFontCacheItem {
     wrapStrategy: WrapStrategy;
     imageCacheMap: ImageCacheMap;
     cellData: Nullable<ICellDataForSheetInterceptor>;
+    fontString: string;
+    style?: Nullable<IStyleData>;
 }
 type colorString = string;
 export interface IStylesCache {
     background?: Record<colorString, ObjectMatrix<string>>;
     backgroundPositions?: ObjectMatrix<ICellWithCoord>;
-    font?: Record<string, ObjectMatrix<IFontCacheItem>>;
     /**
      * Get value from getCell in skeleton and this value is used in font extension
      */

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

@@ -1,4 +1,4 @@
-import { DocumentDataModel, ICellData, ICellDataForSheetInterceptor, ICellInfo, ICellWithCoord, IColAutoWidthInfo, IColumnRange, IGetRowColByPosOptions, IPaddingData, IRange, IRowAutoHeightInfo, IRowRange, ISize, IStyleData, ITextRotation, Nullable, Styles, VerticalAlign, Worksheet, BooleanNumber, HorizontalAlign, IConfigService, IContextService, Injector, LocaleService, ObjectMatrix, SheetSkeleton, WrapStrategy } from '@univerjs/core';
+import { DocumentDataModel, ICellData, ICellDataForSheetInterceptor, ICellInfo, ICellWithCoord, IColAutoWidthInfo, IColumnRange, IGetRowColByPosOptions, IPaddingData, IRange, IRowAutoHeightInfo, IRowRange, ISize, IStyleData, ITextRotation, Nullable, Styles, Worksheet, BooleanNumber, HorizontalAlign, IConfigService, IContextService, Injector, LocaleService, ObjectMatrix, SheetSkeleton, VerticalAlign, WrapStrategy } from '@univerjs/core';
 import { IBoundRectNoAngle, IPoint, IViewportInfo } from '../../basics/vector2';
 import { Scene } from '../../scene';
 import { IFontCacheItem, IStylesCache, SHEET_VIEWPORT_KEY } from './interfaces';
@@ -44,10 +44,10 @@ export declare class SpreadsheetSkeleton extends SheetSkeleton {
     private _visibleRangeMap;
     private _overflowCache;
     private _stylesCache;
+    private _clearTaskId;
     /** A matrix to store if a (row, column) position has render cache. */
     private _handleBgMatrix;
     private _handleBorderMatrix;
-    private _handleFontMatrix;
     private _showGridlines;
     private _gridlinesColor;
     private _scene;
@@ -83,6 +83,10 @@ export declare class SpreadsheetSkeleton extends SheetSkeleton {
     updateVisibleRange(vpInfo?: IViewportInfo): boolean;
     getVisibleRangeByViewport(viewportKey: SHEET_VIEWPORT_KEY): IRowColumnRange | undefined;
     getVisibleRanges(): Map<SHEET_VIEWPORT_KEY, IRowColumnRange>;
+    /**
+     * Clear cache out of visible range when browser are free.
+     */
+    private _clearCacheOutOfVisibleRange;
     /**
      * Set border background and font to this._stylesCache by visible range, which derives from bounds)
      * @param vpInfo viewBounds
@@ -93,7 +97,8 @@ export declare class SpreadsheetSkeleton extends SheetSkeleton {
      * @param ranges
      * @returns {IRowAutoHeightInfo[]} result
      */
-    calculateAutoHeightInRange(ranges: Nullable<IRange[]>): IRowAutoHeightInfo[];
+    calculateAutoHeightInRange(ranges: Nullable<IRange[]>, currentCellHeights?: ObjectMatrix<number>): IRowAutoHeightInfo[];
+    calculateAutoHeightForCell(row: number, col: number): number | undefined;
     private _calculateRowAutoHeight;
     calculateAutoWidthInRange(ranges: Nullable<IRange[]>): IColAutoWidthInfo[];
     /**
@@ -110,7 +115,7 @@ export declare class SpreadsheetSkeleton extends SheetSkeleton {
      * @param cell
      * @returns {number} currColWidth
      */
-    _getMeasuredWidthByCell(cell: ICellDataForSheetInterceptor, currColWidth: number): number;
+    _getMeasuredWidthByCell(cell: ICellDataForSheetInterceptor, row: number, column: number, currColWidth: number): number;
     /**
      * @deprecated use `getRangeByViewport` instead.
      * @param bounds
@@ -225,7 +230,7 @@ export declare class SpreadsheetSkeleton extends SheetSkeleton {
         mergeRange?: IRange;
         cacheItem?: ICacheItem;
     } | undefined): void;
-    _setFontStylesCache(row: number, col: number, cellData: Nullable<ICellDataForSheetInterceptor>): void;
+    _setFontStylesCache(row: number, col: number, cellData: Nullable<ICellDataForSheetInterceptor>, style: IStyleData): void;
     /**
      * Set border background and font to this._stylesCache cell by cell.
      * @param row {number}

package/lib/types/index.d.ts

@@ -15,6 +15,7 @@
  */
 export * from './base-object';
 export * from './basics';
+export * from './components/docs/layout/doc-simple-skeleton';
 export { getOffsetRectForDom } from './basics/position';
 export * from './canvas';
 export * from './components';

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

@@ -25,3 +25,4 @@ export * from './regular-polygon';
 export * from './rich-text';
 export * from './scroll-bar';
 export * from './shape';
+export * from './text';

package/lib/types/shape/scroll-bar.d.ts

@@ -6,28 +6,30 @@ import { Viewport } from '../viewport';
 import { Rect } from './rect';
 export interface IScrollBarProps {
     mainScene?: Scene;
+    /** Margin between the track to the edge of the scrollable area. Default is 2px. */
     thumbMargin?: number;
     thumbLengthRatio?: number;
+    /** Background color of the thumb. */
     thumbBackgroundColor?: string;
+    /** Background color of the thumb on hover. */
     thumbHoverBackgroundColor?: string;
+    /** Background color of the thumb when active. */
     thumbActiveBackgroundColor?: string;
-    /**
-     * The thickness of a scrolling track(not scrolling thumb).
-     */
+    /** Background color of the track. */
+    trackBackgroundColor?: string;
+    /** Background color of the track border. */
+    trackBorderColor?: string;
+    /** The thickness of a scrolling track (not scrolling thumb). */
     barSize?: number;
-    /**
-     * The thickness of track border.
-     */
+    /** The thickness of track border. */
     barBorder?: number;
+    /** Enable the horizontal scroll bar. True by default. */
     enableHorizontal?: boolean;
+    /** Enable the vertical scroll bar. True by default. */
     enableVertical?: boolean;
-    /**
-     * The min width of horizon thumb
-     */
+    /** The min width of horizon thumb. Default is 17 px. */
     minThumbSizeH?: number;
-    /**
-     * The min height of vertical thumb
-     */
+    /** The min height of vertical thumb. Default is 17 px. */
     minThumbSizeV?: number;
 }
 export declare class ScrollBar extends Disposable {

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

@@ -1,6 +1,36 @@
+import { Nullable, HorizontalAlign, VerticalAlign } from '@univerjs/core';
+import { UniverRenderingContext } from '../context';
 import { IShapeProps, Shape } from './shape';
+import { DocSimpleSkeleton } from '../components/docs/layout/doc-simple-skeleton';
 export interface ITextProps extends IShapeProps {
     width: number;
+    height: number;
+    text: string;
+    fontStyle: string;
+    warp?: boolean;
+    hAlign?: HorizontalAlign;
+    vAlign?: VerticalAlign;
+    color?: Nullable<string>;
+    strokeLine?: boolean;
+    underline?: boolean;
 }
+export declare const TEXT_OBJECT_ARRAY: string[];
 export declare class Text extends Shape<ITextProps> {
+    text: string;
+    fontStyle: string;
+    warp: boolean;
+    hAlign: HorizontalAlign;
+    vAlign: VerticalAlign;
+    skeleton: DocSimpleSkeleton;
+    constructor(key: string, props: ITextProps);
+    static drawWith(ctx: UniverRenderingContext, props: ITextProps, _skeleton?: DocSimpleSkeleton): number;
+    /**
+     * Draw text decoration lines (underline, strikethrough, etc.)
+     */
+    private static _drawTextDecoration;
+    protected _draw(ctx: UniverRenderingContext): void;
+    makeDirty(state?: boolean): this | undefined;
+    toJson(): {
+        [x: string]: any;
+    };
 }