@univerjs/engine-render 0.5.0-alpha.0 → 0.5.0-beta.0

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

@@ -1,4 +1,4 @@
-import { BulletAlignment, ColumnSeparatorType, DataStreamTreeTokenType, IDocDrawingBase, IDocumentRenderConfig, INestingLevel, IParagraphProperties, ITable, ITextStyle, PageOrientType } from '@univerjs/core';
+import { BulletAlignment, ColumnSeparatorType, DataStreamTreeTokenType, IDocDrawingBase, IDocumentRenderConfig, INestingLevel, IParagraphProperties, ITable, ITableRow, ITextStyle, PageOrientType } from '@univerjs/core';
 import { BreakPointType } from '../components/docs/layout/line-breaker/break';
 export interface IDocumentSkeletonCached extends ISkeletonResourceReference {
     pages: IDocumentSkeletonPage[];
@@ -85,6 +85,7 @@ export interface IDocumentSkeletonRow {
     top: number;
     st: number;
     ed: number;
+    rowSource: ITableRow;
     parent?: IDocumentSkeletonTable;
 }
 export interface IDocumentSkeletonColumn {

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

@@ -1,8 +1,8 @@
 import { BooleanNumber, GridType, IDocStyleBase, IDocumentLayout, IOffset, IParagraphStyle, IReferenceSource, IScale, ISectionBreakBase, ISize, ITextStyle, ITransformState, LocaleService } from '@univerjs/core';
 import { DocumentViewModel } from '../components/docs/view-model/document-view-model';
 import { DocumentSkeletonPageType, IDocumentSkeletonBullet, IDocumentSkeletonDrawing, IDocumentSkeletonDrawingAnchor, IDocumentSkeletonFontStyle, IDocumentSkeletonGlyph, IDocumentSkeletonHeaderFooter, IDocumentSkeletonTable } from './i-document-skeleton-cached';
-import { Vector2 } from './vector2';
 import { ITransformerConfig } from './transformer-config';
+import { Vector2 } from './vector2';
 export interface IObjectFullState extends ITransformState {
     strokeWidth?: number;
     zIndex?: number;
@@ -62,7 +62,7 @@ export interface IParagraphTableCache {
 }
 export interface IParagraphConfig {
     paragraphIndex: number;
-    paragraphAffectSkeDrawings?: Map<string, IDocumentSkeletonDrawing>;
+    paragraphNonInlineSkeDrawings?: Map<string, IDocumentSkeletonDrawing>;
     paragraphInlineSkeDrawings?: Map<string, IDocumentSkeletonDrawing>;
     skeTablesInParagraph?: IParagraphTableCache[];
     bulletSkeleton?: IDocumentSkeletonBullet;

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

@@ -1,4 +1,4 @@
-import { IRange, IRangeWithCoord, IScale, ISelectionCell, ISelectionCellWithMergeInfo, IStyleBase, Nullable } from '@univerjs/core';
+import { ICellInfo, ICellWithCoord, IPosition, IRange, IRangeWithCoord, IScale, IStyleBase, Nullable } from '@univerjs/core';
 import { IDocumentSkeletonFontStyle } from './i-document-skeleton-cached';
 import { IBoundRectNoAngle } from './vector2';
 export declare const getColor: (RgbArray: number[], opacity?: number) => string;
@@ -65,36 +65,32 @@ export declare function pxToPt(px: number): number;
 export declare function ptToMM(px: number): number;
 export declare function pxToInch(px: number): number;
 export declare function getScale(parentScale: IScale): number;
-export declare function getCellPositionByIndex(row: number, column: number, rowHeightAccumulation: number[], columnWidthAccumulation: number[]): {
-    startY: number;
-    endY: number;
-    startX: number;
-    endX: number;
-};
+export declare function getCellPositionByIndex(row: number, column: number, rowHeightAccumulation: number[], columnWidthAccumulation: number[]): IPosition;
 /**
  * @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
+ * @param {ICellInfo} mergeData The merge information of the cell
+ * @returns {ICellWithCoord} 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;
+export declare function getCellWithCoordByIndexCore(row: number, column: number, rowHeightAccumulation: number[], columnWidthAccumulation: number[], mergeDataInfo: ICellInfo): ICellWithCoord;
 /**
- * @deprecated please use getCellByIndexWithMergeInfo instead
+ * @deprecated please use getCellWithCoordByIndexCore instead
  */
-export declare function getCellByIndex(row: number, column: number, rowHeightAccumulation: number[], columnWidthAccumulation: number[], mergeData: IRange[]): ISelectionCellWithMergeInfo;
+declare const getCellByIndexWithMergeInfo: typeof getCellWithCoordByIndexCore;
+export { getCellByIndexWithMergeInfo };
 /**
- * @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
+ * @deprecated please use SpreadsheetSkeleton@_hasUnMergedCellInRow
  */
 export declare function hasUnMergedCellInRow(row: number, startColumn: number, endColumn: number, mergeData: IRange[]): boolean;
 export declare function mergeInfoOffset(mergeInfo: IRangeWithCoord, offsetX: number, offsetY: number): {
-    startX: number;
     startY: number;
-    endX: number;
     endY: number;
+    startX: number;
+    endX: number;
     rangeType?: import('@univerjs/core').RANGE_TYPE;
     startAbsoluteRefType?: import('@univerjs/core').AbsoluteRefType;
     endAbsoluteRefType?: import('@univerjs/core').AbsoluteRefType;
@@ -147,10 +143,10 @@ export declare function inRowViewRanges(ranges: IRange[], rowIndex: number): boo
  * @param {IRange[]} ranges
  */
 export declare function expandRangeIfIntersects(mainRanges: IRange[], ranges: IRange[]): IRange[];
-export declare function clampRange(range: IRange): {
+export declare function clampRange(range: IRange, maxRow: number, maxColumn: number): {
     startRow: number;
-    startColumn: number;
     endRow: number;
+    startColumn: number;
     endColumn: number;
 };
 export declare function getSystemHighlightColor(): import('@univerjs/core').IRgbColor;

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

@@ -5,7 +5,6 @@ import { docExtension } from '../doc-extension';
 export declare class FontAndBaseLine extends docExtension {
     uKey: string;
     Z_INDEX: number;
-    private _preFontString;
     private _preFontColor;
     draw(ctx: UniverRenderingContext, parentScale: IScale, glyph: IDocumentSkeletonGlyph): void;
     private _fillText;

package/lib/types/components/docs/layout/block/table.d.ts

@@ -1,9 +1,13 @@
-import { ITable } from '@univerjs/core';
+import { ITable, Nullable } from '@univerjs/core';
 import { IDocumentSkeletonPage, IDocumentSkeletonTable, ISectionBreakConfig } from '../../../../basics';
 import { DataStreamTreeNode } from '../../view-model/data-stream-tree-node';
 import { DocumentViewModel } from '../../view-model/document-view-model';
 import { ILayoutContext } from '../tools';
 export declare function createTableSkeleton(ctx: ILayoutContext, curPage: IDocumentSkeletonPage, viewModel: DocumentViewModel, tableNode: DataStreamTreeNode, sectionBreakConfig: ISectionBreakConfig): IDocumentSkeletonTable;
+export declare function splitTable(tableSke: IDocumentSkeletonTable, availableHeight: number): [
+    Nullable<IDocumentSkeletonTable>,
+    Nullable<IDocumentSkeletonTable>
+];
 export declare function getNullTableSkeleton(st: number, ed: number, table: ITable): IDocumentSkeletonTable;
 export declare function getTableSliceId(tableId: string, sliceIndex: number): string;
 export declare function getTableIdAndSliceIndex(tableSliceId: string): {

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

@@ -1,6 +1,7 @@
 import { Nullable } from '@univerjs/core';
-import { IDocumentSkeletonDivide, IDocumentSkeletonDrawing, IDocumentSkeletonDrawingAnchor, IDocumentSkeletonLine, IDocumentSkeletonPage, LineType } from '../../../../basics/i-document-skeleton-cached';
 import { IParagraphConfig } from '../../../../basics';
+import { IDocumentSkeletonDivide, IDocumentSkeletonDrawingAnchor, IDocumentSkeletonLine, IDocumentSkeletonPage, LineType } from '../../../../basics/i-document-skeleton-cached';
+import { IFloatObject } from '../tools';
 interface ILineBoundingBox {
     lineHeight: number;
     lineTop: number;
@@ -16,7 +17,7 @@ export declare function createSkeletonLine(paragraphIndex: number, lineType: Lin
 export declare function calculateLineTopByDrawings(lineHeight: number | undefined, lineTop: number | undefined, page: IDocumentSkeletonPage, headerPage: Nullable<IDocumentSkeletonPage>, footerPage: Nullable<IDocumentSkeletonPage>): number;
 export declare function updateDivideInfo(divide: IDocumentSkeletonDivide, states: Partial<IDocumentSkeletonDivide>): void;
 export declare function setLineMarginBottom(line: IDocumentSkeletonLine, marginBottom: number): void;
-export declare function collisionDetection(drawing: IDocumentSkeletonDrawing, lineHeight: number, lineTop: number, columnLeft: number, columnWidth: number): boolean;
+export declare function collisionDetection(floatObject: IFloatObject, lineHeight: number, lineTop: number, columnLeft: number, columnWidth: number): boolean;
 export declare function getBoundingBox(angle: number, left: number, width: number, top: number, height: number): import('../../../..').IRect;
 export declare function createAndUpdateBlockAnchor(paragraphIndex: number, line: IDocumentSkeletonLine, top: number, drawingAnchor?: Map<number, IDocumentSkeletonDrawingAnchor>): void;
 export {};

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

@@ -1,8 +1,8 @@
 import { ITable } from '@univerjs/core';
 import { IDocumentSkeletonPage, ISkeletonResourceReference, BreakType } from '../../../../basics/i-document-skeleton-cached';
 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 { DataStreamTreeNode } from '../../view-model/data-stream-tree-node';
 export declare function createSkeletonPage(ctx: ILayoutContext, sectionBreakConfig: ISectionBreakConfig, skeletonResourceReference: ISkeletonResourceReference, pageNumber?: number, breakType?: BreakType): IDocumentSkeletonPage;
 export declare function createSkeletonCellPage(ctx: ILayoutContext, viewModel: DocumentViewModel, cellNode: DataStreamTreeNode, sectionBreakConfig: ISectionBreakConfig, tableConfig: ITable, row: number, col: number): IDocumentSkeletonPage;

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

@@ -1,5 +1,5 @@
 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 { IDocumentSkeletonCached, IDocumentSkeletonColumn, IDocumentSkeletonDivide, 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';
 import { DocumentViewModel } from '../view-model/document-view-model';
@@ -75,6 +75,20 @@ export declare function getFontConfigFromLastGlyph(glyph: IDocumentSkeletonGlyph
 export declare function getFontCreateConfig(index: number, viewModel: DocumentViewModel, paragraphNode: DataStreamTreeNode, sectionBreakConfig: ISectionBreakConfig, paragraph: IParagraph): IFontCreateConfig;
 export declare function getNullSkeleton(): IDocumentSkeletonCached;
 export declare function setPageParent(pages: IDocumentSkeletonPage[], parent: IDocumentSkeletonCached): void;
+export declare enum FloatObjectType {
+    IMAGE = "IMAGE",
+    TABLE = "TABLE"
+}
+export interface IFloatObject {
+    id: string;
+    top: number;
+    left: number;
+    width: number;
+    height: number;
+    angle: number;
+    type: FloatObjectType;
+    positionV: IObjectPositionV;
+}
 export interface ILayoutContext {
     viewModel: DocumentViewModel;
     dataModel: DocumentDataModel;
@@ -83,10 +97,10 @@ export interface ILayoutContext {
     layoutStartPointer: Record<string, Nullable<number>>;
     isDirty: boolean;
     skeletonResourceReference: ISkeletonResourceReference;
-    drawingsCache: Map<string, {
+    floatObjectsCache: Map<string, {
         count: number;
         page: IDocumentSkeletonPage;
-        drawing: IDocumentSkeletonDrawing;
+        floatObject: IFloatObject;
     }>;
     paragraphConfigCache: Map<string, Map<number, IParagraphConfig>>;
     sectionBreakConfigCache: Map<number, ISectionBreakConfig>;

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

@@ -25,7 +25,7 @@ export declare class SpreadsheetColumnHeader extends SpreadsheetHeader {
     isHit(coord: Vector2): boolean;
     private _initialDefaultExtension;
     /**
-     * Custimize column header, such as custom header text and background.
+     * Customize column header, such as custom header text and background.
      * @param cfg
      */
     setCustomHeader(cfg: IColumnsHeaderCfgParam): void;

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

@@ -1,4 +1,4 @@
-import { IRange, IScale, ISelectionCellWithMergeInfo, ObjectMatrix } from '@univerjs/core';
+import { ICellWithCoord, IRange, IScale, ObjectMatrix } from '@univerjs/core';
 import { UniverRenderingContext } from '../../../context';
 import { IDrawInfo } from '../../extension';
 import { SpreadsheetSkeleton } from '../sheet-skeleton';
@@ -6,14 +6,14 @@ import { SheetExtension } from './sheet-extension';
 interface IRenderBGContext {
     ctx: UniverRenderingContext;
     spreadsheetSkeleton: SpreadsheetSkeleton;
-    backgroundPositions: ObjectMatrix<ISelectionCellWithMergeInfo>;
+    backgroundPositions: ObjectMatrix<ICellWithCoord>;
     checkOutOfViewBound: boolean;
     backgroundPaths: Path2D;
     scaleX: number;
     scaleY: number;
     viewRanges: IRange[];
     diffRanges: IRange[];
-    cellInfo: ISelectionCellWithMergeInfo;
+    cellInfo: ICellWithCoord;
 }
 export declare class Background extends SheetExtension {
     uKey: string;

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

@@ -1,7 +1,7 @@
 import { IRange, IScale } from '@univerjs/core';
-import { SheetExtension } from './sheet-extension';
 import { UniverRenderingContext } from '../../../context';
 import { SpreadsheetSkeleton } from '../sheet-skeleton';
+import { SheetExtension } from './sheet-extension';
 export declare class Custom extends SheetExtension {
     protected Z_INDEX: number;
     uKey: string;

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

@@ -1,4 +1,4 @@
-import { ICellDataForSheetInterceptor, IRange, IScale, ISelectionCellWithMergeInfo, Nullable, ObjectMatrix } from '@univerjs/core';
+import { ICellDataForSheetInterceptor, ICellWithCoord, IRange, IScale, Nullable, ObjectMatrix } from '@univerjs/core';
 import { UniverRenderingContext } from '../../../context';
 import { IDrawInfo } from '../../extension';
 import { IFontCacheItem } from '../interfaces';
@@ -16,19 +16,19 @@ interface IRenderFontContext {
     diffRanges: IRange[];
     spreadsheetSkeleton: SpreadsheetSkeleton;
     overflowRectangle: Nullable<IRange>;
-    cellData: ICellDataForSheetInterceptor;
+    cellData: Nullable<ICellDataForSheetInterceptor>;
     startY: number;
     endY: number;
     startX: number;
     endX: number;
-    cellInfo: ISelectionCellWithMergeInfo;
+    cellInfo: ICellWithCoord;
 }
 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(renderFontCtx: IRenderFontContext, row: number, col: number, fontMatrix: ObjectMatrix<IFontCacheItem>): true | undefined;
+    _renderFontEachCell(renderFontCtx: IRenderFontContext, row: number, col: number, fontMatrix: ObjectMatrix<IFontCacheItem>): boolean;
     /**
      * Change font render bounds, for overflow and filter icon & custom render.
      * @param renderFontContext

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

@@ -1,7 +1,7 @@
 import { IRange, IScale } from '@univerjs/core';
-import { SheetExtension } from './sheet-extension';
 import { UniverRenderingContext } from '../../../context';
 import { SpreadsheetSkeleton } from '../sheet-skeleton';
+import { SheetExtension } from './sheet-extension';
 export declare class Marker extends SheetExtension {
     protected Z_INDEX: number;
     uKey: string;

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

@@ -1,6 +1,6 @@
 import { IRange } from '@univerjs/core';
-import { ComponentExtension } from '../../extension';
 import { SpreadsheetSkeleton } from '../sheet-skeleton';
+import { ComponentExtension } from '../../extension';
 export declare enum SHEET_EXTENSION_TYPE {
     GRID = 0
 }
@@ -10,23 +10,11 @@ export declare enum SHEET_EXTENSION_TYPE {
 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
-     * @param columnIndex
-     * @param rowHeightAccumulation
-     * @param columnWidthAccumulation
-     * @param dataMergeCache
-     * @returns {ISelectionCellWithMergeInfo} cell Position & mergeInfo
-     */
-    getCellByIndex(rowIndex: number, columnIndex: number, rowHeightAccumulation: number[], columnWidthAccumulation: number[], dataMergeCache: IRange[]): import('@univerjs/core').ISelectionCellWithMergeInfo;
     isRenderDiffRangesByCell(rangeP: IRange, diffRanges?: IRange[]): boolean;
     isRenderDiffRangesByColumn(curStartColumn: number, curEndColumn: number, diffRanges?: IRange[]): boolean;
     isRenderDiffRangesByRow(curStartRow: number, curEndRow: number, diffRanges?: IRange[]): boolean;
     /**
-     * 传入的 row 范围和 diffRanges 有相交, 返回 true
+     * Check if row range is in view ranges
      * @param curStartRow
      * @param curEndRow
      * @param viewranges

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

@@ -1,4 +1,4 @@
-import { BorderStyleTypes, HorizontalAlign, ISelectionCellWithMergeInfo, ObjectMatrix, VerticalAlign, WrapStrategy } from '@univerjs/core';
+import { BorderStyleTypes, HorizontalAlign, ICellWithCoord, ObjectMatrix, VerticalAlign, WrapStrategy } from '@univerjs/core';
 import { BORDER_TYPE as BORDER_LTRB } from '../../basics/const';
 import { Canvas } from '../../canvas';
 import { UniverRenderingContext } from '../../context';
@@ -22,7 +22,7 @@ export interface IFontCacheItem {
 type colorString = string;
 export interface IStylesCache {
     background?: Record<colorString, ObjectMatrix<string>>;
-    backgroundPositions?: ObjectMatrix<ISelectionCellWithMergeInfo>;
+    backgroundPositions?: ObjectMatrix<ICellWithCoord>;
     font?: Record<string, ObjectMatrix<IFontCacheItem>>;
     fontMatrix: ObjectMatrix<IFontCacheItem>;
     border?: ObjectMatrix<BorderCache>;

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

@@ -1,4 +1,4 @@
-import { ICellData, ICellDataForSheetInterceptor, IColAutoWidthInfo, IColumnRange, IPaddingData, IPosition, IRange, IRowAutoHeightInfo, IRowRange, ISelectionCellWithMergeInfo, ISize, IStyleData, ITextRotation, IWorksheetData, Nullable, Styles, VerticalAlign, Worksheet, BooleanNumber, DocumentDataModel, HorizontalAlign, IConfigService, IContextService, LocaleService, ObjectMatrix, WrapStrategy } from '@univerjs/core';
+import { ICellData, ICellDataForSheetInterceptor, ICellInfo, ICellWithCoord, IColAutoWidthInfo, IColumnRange, IPaddingData, IPosition, IRange, IRowAutoHeightInfo, IRowRange, ISize, IStyleData, ITextRotation, IWorksheetData, Nullable, Styles, VerticalAlign, Worksheet, BooleanNumber, DocumentDataModel, HorizontalAlign, IConfigService, IContextService, LocaleService, ObjectMatrix, WrapStrategy } from '@univerjs/core';
 import { IBoundRectNoAngle, IViewportInfo } from '../../basics/vector2';
 import { DocumentSkeleton } from '../docs/layout/doc-skeleton';
 import { Skeleton } from '../skeleton';
@@ -34,7 +34,20 @@ export interface ICacheItem {
 }
 export interface IGetRowColByPosOptions {
     closeFirst?: boolean;
-    visibleOnly?: boolean;
+    /**
+     * For searchArray(rowHeightAccumulation) & searchArray(colWidthAccumulation)
+     * true means return first matched index in matched sequence.
+     * default return last index in matched sequence.
+     */
+    firstMatch?: boolean;
+}
+export interface IGetPosByRowColOptions {
+    closeFirst?: boolean;
+    /**
+     * for searchArray(rowHeightAccumulation) & searchArray(colWidthAccumulation)
+     * true means return first matched index in array
+     */
+    firstMatch?: boolean;
 }
 export declare class SpreadsheetSkeleton extends Skeleton {
     readonly worksheet: Worksheet;
@@ -158,6 +171,12 @@ export declare class SpreadsheetSkeleton extends Skeleton {
     getWorksheetConfig(): IWorksheetData;
     getRangeByViewBound(bound?: IBoundRectNoAngle): IRange;
     getMergeBounding(startRow: number, startColumn: number, endRow: number, endColumn: number): IRange;
+    /**
+     * expand curr range if it's intersect with merge range.
+     * @param range
+     * @returns {IRange} expanded range because merge info.
+     */
+    expandRangeByMerge(range: IRange): IRange;
     appendToOverflowCache(row: number, column: number, startColumn: number, endColumn: number): void;
     getColumnCount(): number;
     getRowCount(): number;
@@ -165,42 +184,101 @@ export declare class SpreadsheetSkeleton extends Skeleton {
     getNoMergeCellPositionByIndex(rowIndex: number, columnIndex: number): IPosition;
     getNoMergeCellPositionByIndexWithNoHeader(rowIndex: number, columnIndex: number): IPosition;
     /**
+     * Get cell by pos(offsetX, offsetY).
+     * @deprecated Please use `getCellWithCoordByOffset` instead.
+     */
+    calculateCellIndexByPosition(offsetX: number, offsetY: number, scaleX: number, scaleY: number, scrollXY: {
+        x: number;
+        y: number;
+    }): Nullable<ICellWithCoord>;
+    /**
+     * Get cell by pos(offsetX, offsetY).
+     *
+     * options.matchFirst true means get cell would skip all invisible cells.
+     * @param offsetX position X in viewport.
+     * @param offsetY position Y in viewport.
+     * @param scaleX render scene scale x-axis, scene.getAncestorScale
+     * @param scaleY render scene scale y-axis, scene.getAncestorScale
+     * @param scrollXY render viewportScroll {x, y}
+     * @param options {IGetRowColByPosOptions}
+     * @returns {ICellWithCoord} Selection data with coordinates
+     */
+    getCellWithCoordByOffset(offsetX: number, offsetY: number, scaleX: number, scaleY: number, scrollXY: {
+        x: number;
+        y: number;
+    }, options?: IGetRowColByPosOptions): ICellWithCoord;
+    /**
+     * This method has the same implementation as `getCellIndexByOffset`,
+     * but uses a different name to maintain backward compatibility with previous calls.
      *
-     * @param offsetX HTML coordinate system, mouse position x.
-     * @param offsetY HTML coordinate system, mouse position y.
+     * @deprecated Please use `getCellIndexByOffset` method instead.
+     */
+    getCellPositionByOffset(offsetX: number, offsetY: number, scaleX: number, scaleY: number, scrollXY: {
+        x: number;
+        y: number;
+    }, options?: IGetRowColByPosOptions): {
+        row: number;
+        column: number;
+    };
+    /**
+     * Get cell index by offset(o)
+     * @param offsetX position X in viewport.
+     * @param offsetY position Y in viewport.
      * @param scaleX render scene scale x-axis, scene.getAncestorScale
      * @param scaleY render scene scale y-axis, scene.getAncestorScale
      * @param scrollXY  render viewport scroll {x, y}, scene.getScrollXYByRelativeCoords, scene.getScrollXY
      * @param scrollXY.x
      * @param scrollXY.y
-     * @returns Hit cell coordinates
+     * @returns cell index
      */
-    getCellPositionByOffset(offsetX: number, offsetY: number, scaleX: number, scaleY: number, scrollXY: {
+    getCellIndexByOffset(offsetX: number, offsetY: number, scaleX: number, scaleY: number, scrollXY: {
         x: number;
         y: number;
     }, options?: IGetRowColByPosOptions): {
         row: number;
         column: number;
     };
+    getCellByOffset(offsetX: number, offsetY: number, scaleX: number, scaleY: number, scrollXY: {
+        x: number;
+        y: number;
+    }): Nullable<ICellInfo>;
+    getCellWithMergeInfoByIndex(row: number, column: number): Nullable<ICellInfo>;
     /**
-     * Get column index by offsetX
-     * @param offsetX no scaled offset x
-     * @param scaleX scale x
-     * @param scrollXY
+     * Same as getColumnIndexByOffsetX
+     * @deprecated Please use `getColumnIndexByOffsetX` method instead.
      */
     getColumnPositionByOffsetX(offsetX: number, scaleX: number, scrollXY: {
         x: number;
         y: number;
     }, options?: IGetRowColByPosOptions): number;
     /**
-     * Get row index by offsetY
+     * Get column index by offset x.
+     * @param offsetX scaled offset x
+     * @param scaleX scale x
+     * @param scrollXY scrollXY
+     * @returns column index
+     */
+    getColumnIndexByOffsetX(evtOffsetX: number, scaleX: number, scrollXY: {
+        x: number;
+        y: number;
+    }, options?: IGetRowColByPosOptions): number;
+    /**
+     * Same as getRowIndexByOffsetY
+     * @deprecated Please use `getRowIndexByOffsetY` method instead.
+     */
+    getRowPositionByOffsetY(offsetY: number, scaleY: number, scrollXY: {
+        x: number;
+        y: number;
+    }, options?: IGetRowColByPosOptions): number;
+    /**
+     *
      * @param offsetY scaled offset y
      * @param scaleY scale y
      * @param scrollXY
      * @param scrollXY.x
      * @param scrollXY.y
      */
-    getRowPositionByOffsetY(offsetY: number, scaleY: number, scrollXY: {
+    getRowIndexByOffsetY(offsetY: number, scaleY: number, scrollXY: {
         x: number;
         y: number;
     }, options?: IGetRowColByPosOptions): number;
@@ -214,33 +292,61 @@ export declare class SpreadsheetSkeleton extends Skeleton {
     }): number;
     getOffsetByPositionX(column: number): number;
     getOffsetByPositionY(row: number): number;
+    /**
+     * Same as getCellWithCoordByIndex, but uses a different name to maintain backward compatibility with previous calls.
+     * @deprecated Please use `getCellWithCoordByIndex` instead.
+     */
+    getCellByIndex(row: number, column: number): ICellWithCoord;
+    /**
+     * @deprecated Please use `getCellWithCoordByIndex(row, col, false)` instead.
+     * @param row
+     * @param column
+     */
+    getCellByIndexWithNoHeader(row: number, column: number): ICellWithCoord;
     /**
      * Return cell information corresponding to the current coordinates, including the merged cell object.
+     *
      * @param row Specified Row Coordinate
      * @param column Specified Column Coordinate
      */
-    getCellByIndex(row: number, column: number): ISelectionCellWithMergeInfo;
+    getCellWithCoordByIndex(row: number, column: number, header?: boolean): ICellWithCoord;
     /**
-     * New merge info, but position without header.
-     * @param row
-     * @param column
-     * @returns {ISelectionCellWithMergeInfo} cellInfo with merge info
+     * convert canvas content position to physical position in screen
+     * @param offsetX
+     * @param scaleX
+     * @param scrollXY
      */
-    getCellByIndexWithNoHeader(row: number, column: number): ISelectionCellWithMergeInfo;
     convertTransformToOffsetX(offsetX: number, scaleX: number, scrollXY: {
         x: number;
         y: number;
     }): number;
+    /**
+     * convert canvas content position to physical position in screen
+     * @param offsetY
+     * @param scaleY
+     * @param scrollXY
+     */
     convertTransformToOffsetY(offsetY: number, scaleY: number, scrollXY: {
         x: number;
         y: number;
     }): number;
-    getSelectionMergeBounding(startRow: number, startColumn: number, endRow: number, endColumn: number): IRange;
+    /**
+     * Only used for cell edit, and no need to rotate text when edit cell content!
+     * @deprecated use same method in worksheet.
+     * @param cell
+     */
     getBlankCellDocumentModel(cell: Nullable<ICellData>): IDocumentLayoutObject;
+    /**
+     * Only used for cell edit, and no need to rotate text when edit cell content!
+     * @deprecated use same method in worksheet.
+     * @param cell
+     */
     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.
+     *
+     * @deprecated use same method in worksheet.
      * PS: This method has significant impact on performance.
      * @param cell
      * @param options

package/lib/types/scene.d.ts

@@ -148,26 +148,45 @@ export declare class Scene extends ThinScene {
      */
     findViewportByPosToViewport(coord: Vector2): Viewport | undefined;
     getActiveViewportByCoord(coord: Vector2): Viewport | undefined;
+    /**
+     * @deprecated use `getScrollXYInfoByViewport` instead.
+     * @param pos
+     * @param viewPort
+     */
+    getVpScrollXYInfoByPosToVp(pos: Vector2, viewPort?: Viewport): {
+        x: number;
+        y: number;
+    };
     /**
      * getViewportScrollXYInfo by viewport under cursor position
      * prev getScrollXYByRelativeCoords
      * @param pos
      * @param viewPort
      */
-    getVpScrollXYInfoByPosToVp(pos: Vector2, viewPort?: Viewport): {
+    getScrollXYInfoByViewport(pos: Vector2, viewPort?: Viewport): {
         x: number;
         y: number;
     };
+    getDefaultViewport(): Viewport;
     getViewportScrollXY(viewPort: Viewport): {
         x: number;
         y: number;
     };
     /**
+     * @deprecated use `getCoordRelativeToViewport` instead
+     * @param coord
+     * @returns
+     */
+    getRelativeToViewportCoord(coord: Vector2): Vector2;
+    /**
+     * Get coord to active viewport.
      * In a nested scene scenario, it is necessary to obtain the relative offsets layer by layer.
+     *
+     * origin name: getRelativeToViewportCoord
      * @param coord Coordinates to be converted.
      * @returns
      */
-    getRelativeToViewportCoord(coord: Vector2): Vector2;
+    getCoordRelativeToViewport(coord: Vector2): Vector2;
     clearLayer(): void;
     clearViewports(): void;
     getAncestorScale(): {