@univerjs/engine-render 0.2.14 → 0.2.15

package/lib/types/basics/i-document-skeleton-cached.d.ts

@@ -166,7 +166,6 @@ export interface IDocumentSkeletonBullet {
     ts: ITextStyle;
     fontStyle?: IDocumentSkeletonFontStyle;
     startIndexItem: number;
-    bBox: IDocumentSkeletonBoundingBox;
     nestingLevel?: INestingLevel;
     bulletAlign?: BulletAlignment;
     bulletType?: boolean;

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

@@ -71,28 +71,22 @@ export declare function getCellPositionByIndex(row: number, column: number, rowH
     startX: number;
     endX: number;
 };
-export declare function getCellByIndexWithMergeInfo(row: number, column: number, rowHeightAccumulation: number[], columnWidthAccumulation: number[], mergeDataInfo: ISelectionCell): {
-    isMerged: boolean;
-    isMergedMainCell: boolean;
-    actualRow: number;
-    actualColumn: number;
-    startY: number;
-    endY: number;
-    startX: number;
-    endX: number;
-    mergeInfo: {
-        startRow: number;
-        startColumn: number;
-        endRow: number;
-        endColumn: number;
-        startY: number;
-        endY: number;
-        startX: number;
-        endX: number;
-    };
-};
+/**
+ * @description Get the cell position information of the specified row and column, including the position information of the cell and the merge information of the cell
+ * @param {number} row The row index of the cell
+ * @param {number} column The column index of the cell
+ * @param {number[]} rowHeightAccumulation The accumulated height of each row
+ * @param {number[]} columnWidthAccumulation The accumulated width of each column
+ * @param {ISelectionCell} mergeData The merge information of the cell
+ * @returns {ISelectionCellWithMergeInfo} The cell position information of the specified row and column, including the position information of the cell and the merge information of the cell
+ */
+export declare function getCellByIndexWithMergeInfo(row: number, column: number, rowHeightAccumulation: number[], columnWidthAccumulation: number[], mergeDataInfo: ISelectionCell): ISelectionCellWithMergeInfo;
+/**
+ * @deprecated please use getCellByIndexWithMergeInfo instead
+ */
 export declare function getCellByIndex(row: number, column: number, rowHeightAccumulation: number[], columnWidthAccumulation: number[], mergeData: IRange[]): ISelectionCellWithMergeInfo;
 /**
+ * @deprecated please use _hasUnMergedCellInRow in SpreadsheetSkeleton
  * Determine whether there are any cells in a row that are not in the merged cells, mainly used for the calculation of auto height
  */
 export declare function hasUnMergedCellInRow(row: number, startColumn: number, endColumn: number, mergeData: IRange[]): boolean;

package/lib/types/components/docs/extensions/font-and-base-line.d.ts

@@ -1,7 +1,7 @@
 import { IScale } from '@univerjs/core';
+import { docExtension } from '../doc-extension';
 import { IDocumentSkeletonGlyph } from '../../../basics/i-document-skeleton-cached';
 import { UniverRenderingContext } from '../../../context';
-import { docExtension } from '../doc-extension';
 export declare class FontAndBaseLine extends docExtension {
     uKey: string;
     Z_INDEX: number;

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

@@ -1,6 +1,6 @@
+import { BreakPointType } from '../../line-breaker/break';
 import { IDocumentSkeletonDrawing, IDocumentSkeletonGlyph, IDocumentSkeletonLine, IDocumentSkeletonPage } from '../../../../../basics/i-document-skeleton-cached';
 import { IParagraphConfig, ISectionBreakConfig } from '../../../../../basics/interfaces';
 import { ILayoutContext } from '../../tools';
-import { BreakPointType } from '../../line-breaker/break';
 export declare function layoutParagraph(ctx: ILayoutContext, glyphGroup: IDocumentSkeletonGlyph[], pages: IDocumentSkeletonPage[], sectionBreakConfig: ISectionBreakConfig, paragraphConfig: IParagraphConfig, isParagraphFirstShapedText: boolean, breakPointType?: BreakPointType): IDocumentSkeletonPage[];
 export declare function updateInlineDrawingPosition(line: IDocumentSkeletonLine, paragraphInlineSkeDrawings?: Map<string, IDocumentSkeletonDrawing>, blockAnchorTop?: number): void;

package/lib/types/components/docs/layout/model/glyph.d.ts

@@ -1,4 +1,4 @@
-import { IAdjustability, IDocumentSkeletonBullet, IDocumentSkeletonDivide, IDocumentSkeletonGlyph, GlyphType } from '../../../../basics/i-document-skeleton-cached';
+import { GlyphType, IAdjustability, IDocumentSkeletonBullet, IDocumentSkeletonDivide, IDocumentSkeletonGlyph } from '../../../../basics/i-document-skeleton-cached';
 import { IFontCreateConfig } from '../../../../basics/interfaces';
 import { IOpenTypeGlyphInfo } from '../shaping-engine/text-shaping';
 export declare function isSpace(char: string): boolean;

package/lib/types/components/sheets/extensions/sheet-extension.d.ts

@@ -11,6 +11,7 @@ export declare const SHEET_EXTENSION_PREFIX = "sheet-ext-";
 export declare class SheetExtension extends ComponentExtension<SpreadsheetSkeleton, SHEET_EXTENSION_TYPE, IRange[]> {
     type: SHEET_EXTENSION_TYPE;
     /**
+     * @deprecated The function maybe cause performance issue, use spreadsheetSkeleton.getCellByIndexWithNoHeader instead.
      * Get ISelectionCellWithMergeInfo by cell rowIndex and cell columnIndex.
      * The startXY in return value does not include rowHeader and columnHeader.
      * @param rowIndex

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

@@ -52,8 +52,6 @@ export declare class SpreadsheetSkeleton extends Skeleton {
      * Range of visible area(range in viewBounds)
      */
     private _rowColumnSegment;
-    private _dataMergeCache;
-    private _dataMergeCacheMap;
     private _overflowCache;
     private _stylesCache;
     /** A matrix to store if a (row, column) position has render cache. */
@@ -78,7 +76,6 @@ export declare class SpreadsheetSkeleton extends Skeleton {
      * Range of visible area(range in viewBounds)
      */
     get rowColumnSegment(): IRowColumnRange;
-    get dataMergeCache(): IRange[];
     get stylesCache(): IStylesCache;
     get overflowCache(): ObjectMatrix<IRange>;
     get showGridlines(): BooleanNumber;
@@ -109,6 +106,7 @@ export declare class SpreadsheetSkeleton extends Skeleton {
     calculateWithoutClearingCache(bounds?: IViewportInfo): Nullable<SpreadsheetSkeleton>;
     calculate(bounds?: IViewportInfo): Nullable<SpreadsheetSkeleton>;
     calculateAutoHeightInRange(ranges: Nullable<IRange[]>): IRowAutoHeightInfo[];
+    private _hasUnMergedCellInRow;
     private _calculateRowAutoHeight;
     /**
      * Calculate data for row col & cell position, then update position value to this._rowHeaderWidth & this._rowHeightAccumulation & this._columnHeaderHeight & this._columnWidthAccumulation.
@@ -238,6 +236,11 @@ export declare class SpreadsheetSkeleton extends Skeleton {
     private _generateColumnMatrixCache;
     private _getOverflowBound;
     intersectMergeRange(row: number, column: number): boolean;
+    /**
+     * get the current row and column segment visible merge data
+     * @returns {IRange} The visible merge data
+     */
+    getCurrentRowColumnSegmentMergeData(range?: IRange): IRange[];
     private _calculateStylesCache;
     /**
      * Any changes to sheet model would reset cache.
@@ -262,7 +265,6 @@ export declare class SpreadsheetSkeleton extends Skeleton {
     private _setBorderProps;
     private _getFontFormat;
     private _getOtherStyle;
-    private _getMergeCellsCache;
     private _getCellMergeInfo;
     /**
      * Cache the merged cells on the current screen to improve computational performance.

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

@@ -26,9 +26,9 @@ export declare abstract class BaseScrollBar extends Disposable {
     verticalThumbHeight: number;
     verticalBarHeight: number;
     verticalMinusMiniThumb: number;
-    horizonBarRect: Nullable<Rect>;
+    horizonScrollTrack: Nullable<Rect>;
     horizonThumbRect: Nullable<Rect>;
-    verticalBarRect: Nullable<Rect>;
+    verticalScrollTrack: Nullable<Rect>;
     verticalThumbRect: Nullable<Rect>;
     placeholderBarRect: Nullable<Rect>;
     get limitX(): number;

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

@@ -1,10 +1,10 @@
+import { BaseScrollBar, IScrollBarProps } from './base-scroll-bar';
+import { Rect } from './rect';
 import { Vector2 } from '../basics/vector2';
 import { UniverRenderingContext } from '../context';
 import { Viewport } from '../viewport';
-import { IScrollBarProps, BaseScrollBar } from './base-scroll-bar';
-import { Rect } from './rect';
 export declare class ScrollBar extends BaseScrollBar {
-    protected _view: Viewport;
+    protected _viewport: Viewport;
     private _mainScene;
     private _lastX;
     private _lastY;

package/lib/types/thin-scene.d.ts

@@ -1,13 +1,13 @@
-import { Nullable, Disposable, EventSubject } from '@univerjs/core';
+import { Disposable, EventSubject, Nullable } from '@univerjs/core';
+import { RENDER_CLASS_TYPE, CURSOR_TYPE } from './basics/const';
+import { Transform } from './basics/transform';
 import { BaseObject } from './base-object';
-import { CURSOR_TYPE, RENDER_CLASS_TYPE } from './basics/const';
 import { IDragEvent, IKeyboardEvent, IMouseEvent, IPointerEvent, IWheelEvent } from './basics/i-events';
 import { ITransformChangeState } from './basics/interfaces';
-import { Transform } from './basics/transform';
 import { Vector2 } from './basics/vector2';
 import { UniverRenderingContext } from './context';
-import { ThinEngine } from './thin-engine';
 import { Scene } from './scene';
+import { ThinEngine } from './thin-engine';
 export declare abstract class ThinScene extends Disposable {
     onTransformChange$: EventSubject<ITransformChangeState>;
     onFileLoaded$: EventSubject<string>;

package/lib/types/viewport.d.ts

@@ -87,7 +87,6 @@ export declare class Viewport {
     private _sceneHeightAfterScale;
     onMouseWheel$: EventSubject<IWheelEvent>;
     onScrollAfter$: EventSubject<IScrollObserverParam>;
-    onScrollBefore$: EventSubject<IScrollObserverParam>;
     onScrollEnd$: EventSubject<IScrollObserverParam>;
     onScrollByBar$: EventSubject<IScrollObserverParam>;
     private _viewportKey;
@@ -234,7 +233,7 @@ export declare class Viewport {
         isLimitedY: boolean;
     } | undefined;
     /**
-     * scrolling by current position plus offset
+     * Srolling by current position plus delta.
      * the most common case is triggered by scroll-timer(in sheet)
      * @param delta
      * @returns isLimited
@@ -245,7 +244,6 @@ export declare class Viewport {
         isLimitedX: boolean;
         isLimitedY: boolean;
     } | undefined;
-    scrollByBar(delta: Partial<IScrollBarPosition>, isTrigger?: boolean): void;
     /**
      * Viewport scroll to certain position.
      * @param pos
@@ -264,19 +262,6 @@ export declare class Viewport {
         isLimitedX: boolean;
         isLimitedY: boolean;
     } | undefined;
-    /**
-     * current position plus offset relatively
-     * the caller no need to deal with the padding when frozen
-     * @param offsetX
-     * @param offsetY
-     * @param isTrigger
-     */
-    scrollByOffset(offsetX?: number, offsetY?: number, isTrigger?: boolean): {
-        scrollX: number;
-        scrollY: number;
-        isLimitedX: boolean;
-        isLimitedY: boolean;
-    } | undefined;
     transViewportScroll2ScrollValue(viewportScrollX: number, viewportScrollY: number): {
         x: number;
         y: number;
@@ -368,6 +353,10 @@ export declare class Viewport {
      * update pre scroll value has handled in updateScroll()
      */
     private _afterRender;
+    /**
+     * mock scrollend.
+     * @param scrollSubParam
+     */
     private _emitScrollEnd$;
     /**
      *