@univerjs/engine-render 0.4.2-nightly.202410310419 → 0.4.2-nightly.202411011606

package/lib/es/index.js

@@ -24936,7 +24936,7 @@ let SpreadsheetSkeleton = (_a6 = class extends Skeleton {
     if (!this._worksheetData || (this._updateLayout(), !this._rowHeightAccumulation || !this._columnWidthAccumulation))
       return !1;
     if (bounds != null) {
-      const range = this.getRowColumnSegment(bounds);
+      const range = this.getRangeByBounding(bounds);
       this._visibleRange = range, this._visibleRangeMap.set(bounds.viewportKey, range);
     }
     return !0;
@@ -25168,8 +25168,8 @@ let SpreadsheetSkeleton = (_a6 = class extends Skeleton {
     const widthByComputation = `${this.worksheet.getRowCount()}`.length * 8;
     return Math.max(rowHeader.width, widthByComputation);
   }
-  getRowColumnSegment(bounds) {
-    return this._getBounding(this._rowHeightAccumulation, this._columnWidthAccumulation, bounds == null ? void 0 : bounds.cacheBound);
+  getRangeByBounding(bounds) {
+    return this._getRangeByViewBounding(this._rowHeightAccumulation, this._columnWidthAccumulation, bounds == null ? void 0 : bounds.cacheBound);
   }
   /**
    * @deprecated should never expose a property that is provided by another module!
@@ -25178,8 +25178,8 @@ let SpreadsheetSkeleton = (_a6 = class extends Skeleton {
   getWorksheetConfig() {
     return this._worksheetData;
   }
-  getRowColumnSegmentByViewBound(bound) {
-    return this._getBounding(this._rowHeightAccumulation, this._columnWidthAccumulation, bound);
+  getRangeByViewBound(bound) {
+    return this._getRangeByViewBounding(this._rowHeightAccumulation, this._columnWidthAccumulation, bound);
   }
   getMergeBounding(startRow, startColumn, endRow, endColumn) {
     const mergeData = this._worksheetData.mergeData;
@@ -25280,21 +25280,6 @@ let SpreadsheetSkeleton = (_a6 = class extends Skeleton {
       endX
     };
   }
-  /**
-   * Get cell by pos(offsetX, offsetY).
-   * @param offsetX HTML coordinate system, mouse position x.
-   * @param offsetY HTML coordinate system, mouse position y.
-   * @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 Selection data with coordinates
-   */
-  calculateCellIndexByPosition(offsetX, offsetY, scaleX, scaleY, scrollXY) {
-    const { row, column } = this.getCellPositionByOffset(offsetX, offsetY, scaleX, scaleY, scrollXY);
-    return this.getCellByIndex(row, column);
-  }
   /**
    *
    * @param offsetX HTML coordinate system, mouse position x.
@@ -25306,41 +25291,40 @@ let SpreadsheetSkeleton = (_a6 = class extends Skeleton {
    * @param scrollXY.y
    * @returns Hit cell coordinates
    */
-  getCellPositionByOffset(offsetX, offsetY, scaleX, scaleY, scrollXY, closeFirst) {
-    const row = this.getRowPositionByOffsetY(offsetY, scaleY, scrollXY, closeFirst), column = this.getColumnPositionByOffsetX(offsetX, scaleX, scrollXY, closeFirst);
+  getCellPositionByOffset(offsetX, offsetY, scaleX, scaleY, scrollXY, options) {
+    const row = this.getRowPositionByOffsetY(offsetY, scaleY, scrollXY, options), column = this.getColumnPositionByOffsetX(offsetX, scaleX, scrollXY, options);
     return {
       row,
       column
     };
   }
   /**
-   *
-   * @param offsetX scaled offset x
+   * Get column index by offsetX
+   * @param offsetX no scaled offset x
    * @param scaleX scale x
    * @param scrollXY
-   * @returns
    */
-  getColumnPositionByOffsetX(offsetX, scaleX, scrollXY, closeFirst) {
+  getColumnPositionByOffsetX(offsetX, scaleX, scrollXY, options) {
     var _a10;
     offsetX = this.getTransformOffsetX(offsetX, scaleX, scrollXY);
     const { columnWidthAccumulation } = this;
     let column = searchArray(columnWidthAccumulation, offsetX);
-    return column === Number.POSITIVE_INFINITY ? column = columnWidthAccumulation.length - 1 : column === -1 && (column = 0), closeFirst && Math.abs(columnWidthAccumulation[column] - offsetX) < Math.abs(offsetX - ((_a10 = columnWidthAccumulation[column - 1]) != null ? _a10 : 0)) && (column = column + 1), column;
+    return options != null && options.closeFirst && Math.abs(columnWidthAccumulation[column] - offsetX) < Math.abs(offsetX - ((_a10 = columnWidthAccumulation[column - 1]) != null ? _a10 : 0)) && (column = column + 1), column;
   }
   /**
-   *
+   * Get row index by offsetY
    * @param offsetY scaled offset y
    * @param scaleY scale y
    * @param scrollXY
    * @param scrollXY.x
    * @param scrollXY.y
    */
-  getRowPositionByOffsetY(offsetY, scaleY, scrollXY, closeFirst) {
+  getRowPositionByOffsetY(offsetY, scaleY, scrollXY, options) {
     var _a10;
     const { rowHeightAccumulation } = this;
     offsetY = this.getTransformOffsetY(offsetY, scaleY, scrollXY);
-    let row = searchArray(rowHeightAccumulation, offsetY);
-    return row === Number.POSITIVE_INFINITY ? row = rowHeightAccumulation.length - 1 : row === -1 && (row = 0), closeFirst && Math.abs(rowHeightAccumulation[row] - offsetY) < Math.abs(offsetY - ((_a10 = rowHeightAccumulation[row - 1]) != null ? _a10 : 0)) && (row = row + 1), row;
+    let row = searchArray(rowHeightAccumulation, offsetY, options == null ? void 0 : options.visibleOnly);
+    return options != null && options.closeFirst && Math.abs(rowHeightAccumulation[row] - offsetY) < Math.abs(offsetY - ((_a10 = rowHeightAccumulation[row - 1]) != null ? _a10 : 0)) && (row = row + 1), row;
   }
   getTransformOffsetX(offsetX, scaleX, scrollXY) {
     const { x: scrollX } = scrollXY;
@@ -25512,10 +25496,12 @@ let SpreadsheetSkeleton = (_a6 = class extends Skeleton {
     };
   }
   getDecomposedOffset(offsetX, offsetY) {
-    let column = searchArray(this._columnWidthAccumulation, offsetX), columnOffset = 0;
-    column === -1 || column === 0 ? (column = 0, columnOffset = offsetX) : columnOffset = offsetX - this._columnWidthAccumulation[column - 1];
-    let row = searchArray(this._rowHeightAccumulation, offsetY), rowOffset = 0;
-    return row === -1 || row === 0 ? (row = 0, rowOffset = offsetY) : rowOffset = offsetY - this._rowHeightAccumulation[row - 1], {
+    const column = searchArray(this._columnWidthAccumulation, offsetX);
+    let columnOffset = 0;
+    column === 0 ? columnOffset = offsetX : columnOffset = offsetX - this._columnWidthAccumulation[column - 1];
+    const row = searchArray(this._rowHeightAccumulation, offsetY);
+    let rowOffset = 0;
+    return row === 0 ? rowOffset = offsetY : rowOffset = offsetY - this._rowHeightAccumulation[row - 1], {
       row,
       column,
       columnOffset,
@@ -25582,30 +25568,27 @@ let SpreadsheetSkeleton = (_a6 = class extends Skeleton {
     return !1;
   }
   /**
-   *
+   * Get the range of the bounding area of the canvas.
    * @param rowHeightAccumulation Row layout information
    * @param columnWidthAccumulation Column layout information
    * @param viewBound The range of the visible area of the canvas
    * @returns The range cell index of the canvas visible area
    */
-  _getBounding(rowHeightAccumulation, columnWidthAccumulation, viewBound) {
-    const rhaLength = rowHeightAccumulation.length, cwaLength = columnWidthAccumulation.length;
+  _getRangeByViewBounding(rowHeightAccumulation, columnWidthAccumulation, viewBound) {
+    const lenOfRowData = rowHeightAccumulation.length, lenOfColData = columnWidthAccumulation.length;
     if (!viewBound)
       return {
         startRow: 0,
-        endRow: rhaLength - 1,
+        endRow: lenOfRowData - 1,
         startColumn: 0,
-        endColumn: cwaLength - 1
+        endColumn: lenOfColData - 1
       };
-    let dataset_row_st = -1, dataset_row_ed = -1, dataset_col_st = -1, dataset_col_ed = -1;
-    const row_st = searchArray(rowHeightAccumulation, Math.round(viewBound.top) - this.columnHeaderHeightAndMarginTop), row_ed = searchArray(rowHeightAccumulation, Math.round(viewBound.bottom) - this.columnHeaderHeightAndMarginTop);
-    row_st === -1 && row_ed === 0 ? (dataset_row_st = 0, dataset_row_ed = 0) : (dataset_row_st = Math.max(0, row_st), row_ed === Number.POSITIVE_INFINITY || row_ed >= rhaLength ? dataset_row_ed = rhaLength - 1 : dataset_row_ed = Math.max(0, row_ed));
-    const col_st = searchArray(columnWidthAccumulation, Math.round(viewBound.left) - this.rowHeaderWidthAndMarginLeft), col_ed = searchArray(columnWidthAccumulation, Math.round(viewBound.right) - this.rowHeaderWidthAndMarginLeft);
-    return col_st === -1 && col_ed === 0 ? (dataset_col_st = 0, dataset_col_ed = 0) : (dataset_col_st = Math.max(0, col_st), col_ed === Number.POSITIVE_INFINITY || col_ed >= cwaLength ? dataset_col_ed = cwaLength - 1 : dataset_col_ed = Math.max(0, col_ed)), {
-      startRow: dataset_row_st,
-      endRow: dataset_row_ed,
-      startColumn: dataset_col_st,
-      endColumn: dataset_col_ed
+    const startRow = searchArray(rowHeightAccumulation, Math.round(viewBound.top) - this.columnHeaderHeightAndMarginTop), endRow = searchArray(rowHeightAccumulation, Math.round(viewBound.bottom) - this.columnHeaderHeightAndMarginTop), startColumn = searchArray(columnWidthAccumulation, Math.round(viewBound.left) - this.rowHeaderWidthAndMarginLeft), endColumn = searchArray(columnWidthAccumulation, Math.round(viewBound.right) - this.rowHeaderWidthAndMarginLeft);
+    return {
+      startRow,
+      endRow,
+      startColumn,
+      endColumn
     };
   }
   _generateRowMatrixCache(rowCount, rowData, defaultRowHeight) {
@@ -28728,7 +28711,7 @@ const OBJECT_KEY = "__SHEET_EXTENSION_FONT_DOCUMENT_INSTANCE__", _Spreadsheet =
     if (!spreadsheetSkeleton)
       return;
     this._drawAuxiliary(ctx);
-    const parentScale = this.getParentScale(), diffRanges = this._refreshIncrementalState && viewportInfo.diffBounds ? (_a10 = viewportInfo.diffBounds) == null ? void 0 : _a10.map((bound) => spreadsheetSkeleton.getRowColumnSegmentByViewBound(bound)) : [], viewRanges = [spreadsheetSkeleton.getRowColumnSegmentByViewBound(viewportInfo.cacheBound)], extensions = this.getExtensionsByOrder(), scene = this.getScene();
+    const parentScale = this.getParentScale(), diffRanges = this._refreshIncrementalState && viewportInfo.diffBounds ? (_a10 = viewportInfo.diffBounds) == null ? void 0 : _a10.map((bound) => spreadsheetSkeleton.getRangeByViewBound(bound)) : [], viewRanges = [spreadsheetSkeleton.getRangeByViewBound(viewportInfo.cacheBound)], extensions = this.getExtensionsByOrder(), scene = this.getScene();
     for (const extension of extensions) {
       const timeKey = `${SHEET_EXTENSION_PREFIX}${extension.uKey}`, st = Tools.now();
       extension.draw(ctx, parentScale, spreadsheetSkeleton, diffRanges, {

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/block/paragraph/shaping.d.ts

@@ -1,9 +1,9 @@
-import { BreakPointType } from '../../line-breaker/break';
 import { IDocumentSkeletonGlyph } 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 { BreakPointType } from '../../line-breaker/break';
 export interface IShapedText {
     text: string;
     glyphs: IDocumentSkeletonGlyph[];

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

@@ -32,6 +32,10 @@ export interface ICacheItem {
     bg: boolean;
     border: boolean;
 }
+export interface IGetRowColByPosOptions {
+    closeFirst?: boolean;
+    visibleOnly?: boolean;
+}
 export declare class SpreadsheetSkeleton extends Skeleton {
     readonly worksheet: Worksheet;
     /**
@@ -146,13 +150,13 @@ export declare class SpreadsheetSkeleton extends Skeleton {
      */
     private _updateLayout;
     private _dynamicallyUpdateRowHeaderWidth;
-    getRowColumnSegment(bounds?: IViewportInfo): IRange;
+    getRangeByBounding(bounds?: IViewportInfo): IRange;
     /**
      * @deprecated should never expose a property that is provided by another module!
      * @returns
      */
     getWorksheetConfig(): IWorksheetData;
-    getRowColumnSegmentByViewBound(bound?: IBoundRectNoAngle): IRange;
+    getRangeByViewBound(bound?: IBoundRectNoAngle): IRange;
     getMergeBounding(startRow: number, startColumn: number, endRow: number, endColumn: number): IRange;
     appendToOverflowCache(row: number, column: number, startColumn: number, endColumn: number): void;
     getColumnCount(): number;
@@ -160,21 +164,6 @@ export declare class SpreadsheetSkeleton extends Skeleton {
     getOverflowPosition(contentSize: Required<ISize>, horizontalAlign: HorizontalAlign, row: number, column: number, columnCount: number): IColumnRange;
     getNoMergeCellPositionByIndex(rowIndex: number, columnIndex: number): IPosition;
     getNoMergeCellPositionByIndexWithNoHeader(rowIndex: number, columnIndex: number): IPosition;
-    /**
-     * Get cell by pos(offsetX, offsetY).
-     * @param offsetX HTML coordinate system, mouse position x.
-     * @param offsetY HTML coordinate system, mouse position y.
-     * @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 Selection data with coordinates
-     */
-    calculateCellIndexByPosition(offsetX: number, offsetY: number, scaleX: number, scaleY: number, scrollXY: {
-        x: number;
-        y: number;
-    }): Nullable<ISelectionCellWithMergeInfo>;
     /**
      *
      * @param offsetX HTML coordinate system, mouse position x.
@@ -189,23 +178,22 @@ export declare class SpreadsheetSkeleton extends Skeleton {
     getCellPositionByOffset(offsetX: number, offsetY: number, scaleX: number, scaleY: number, scrollXY: {
         x: number;
         y: number;
-    }, closeFirst?: boolean): {
+    }, options?: IGetRowColByPosOptions): {
         row: number;
         column: number;
     };
     /**
-     *
-     * @param offsetX scaled offset x
+     * Get column index by offsetX
+     * @param offsetX no scaled offset x
      * @param scaleX scale x
      * @param scrollXY
-     * @returns
      */
     getColumnPositionByOffsetX(offsetX: number, scaleX: number, scrollXY: {
         x: number;
         y: number;
-    }, closeFirst?: boolean): number;
+    }, options?: IGetRowColByPosOptions): number;
     /**
-     *
+     * Get row index by offsetY
      * @param offsetY scaled offset y
      * @param scaleY scale y
      * @param scrollXY
@@ -215,7 +203,7 @@ export declare class SpreadsheetSkeleton extends Skeleton {
     getRowPositionByOffsetY(offsetY: number, scaleY: number, scrollXY: {
         x: number;
         y: number;
-    }, closeFirst?: boolean): number;
+    }, options?: IGetRowColByPosOptions): number;
     getTransformOffsetX(offsetX: number, scaleX: number, scrollXY: {
         x: number;
         y: number;
@@ -271,13 +259,13 @@ export declare class SpreadsheetSkeleton extends Skeleton {
      */
     private _calculateOverflowCell;
     /**
-     *
+     * Get the range of the bounding area of the canvas.
      * @param rowHeightAccumulation Row layout information
      * @param columnWidthAccumulation Column layout information
      * @param viewBound The range of the visible area of the canvas
      * @returns The range cell index of the canvas visible area
      */
-    protected _getBounding(rowHeightAccumulation: number[], columnWidthAccumulation: number[], viewBound?: IBoundRectNoAngle): IRange;
+    protected _getRangeByViewBounding(rowHeightAccumulation: number[], columnWidthAccumulation: number[], viewBound?: IBoundRectNoAngle): IRange;
     private _generateRowMatrixCache;
     /**
      * Calc columnWidthAccumulation by columnData