@univerjs/engine-render 0.2.11 → 0.2.13

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

@@ -1,19 +1,15 @@
-import { BooleanNumber, DocumentDataModel, HorizontalAlign, IContextService, LocaleService, ObjectMatrix, VerticalAlign, WrapStrategy, ICellData, IColumnRange, IPaddingData, IPosition, IRange, IRowAutoHeightInfo, ISelectionCellWithMergeInfo, ISize, ITextRotation, IWorksheetData, Nullable, Styles, Worksheet } from '@univerjs/core';
-import { IBoundRectNoAngle, IViewportInfo } from '../../basics/vector2';
+import { BooleanNumber, DocumentDataModel, HorizontalAlign, IContextService, LocaleService, ObjectMatrix, VerticalAlign, WrapStrategy, ICellData, IColumnRange, IPaddingData, IPosition, IRange, IRowAutoHeightInfo, IRowRange, ISelectionCellWithMergeInfo, ISize, ITextRotation, IWorksheetData, Nullable, Styles, Worksheet } from '@univerjs/core';
 import { DocumentSkeleton } from '../docs/layout/doc-skeleton';
 import { Skeleton } from '../skeleton';
-import { IStylesCache } from './interfaces';
+import { IBoundRectNoAngle, IViewportInfo } from '../../basics/vector2';
+import { IFontCacheItem, IStylesCache } from './interfaces';
 /**
  * Obtain the height and width of a cell's text, taking into account scenarios with rotated text.
  * @param documentSkeleton Data of the document's ViewModel
  * @param angleInDegree The rotation angle of an Excel cell, it's **degree**
  */
 export declare function getDocsSkeletonPageSize(documentSkeleton: DocumentSkeleton, angleInDegree?: number): Nullable<Required<ISize>>;
-interface IRowColumnSegment {
-    startRow: number;
-    endRow: number;
-    startColumn: number;
-    endColumn: number;
+interface IRowColumnRange extends IRowRange, IColumnRange {
 }
 export interface IDocumentLayoutObject {
     documentModel: Nullable<DocumentDataModel>;
@@ -53,14 +49,15 @@ export declare class SpreadsheetSkeleton extends Skeleton {
     private _rowHeaderWidth;
     private _columnHeaderHeight;
     /**
-     * skeletonData(row col range) of visible area
+     * 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. */
-    private _renderedCellCache;
+    private _cellBgAndBorderCache;
     private _showGridlines;
     private _marginTop;
     private _marginLeft;
@@ -78,9 +75,9 @@ export declare class SpreadsheetSkeleton extends Skeleton {
     get rowHeaderWidth(): number;
     get columnHeaderHeight(): number;
     /**
-     * row col start & end range
+     * Range of visible area(range in viewBounds)
      */
-    get rowColumnSegment(): IRowColumnSegment;
+    get rowColumnSegment(): IRowColumnRange;
     get dataMergeCache(): IRange[];
     get stylesCache(): IStylesCache;
     get overflowCache(): ObjectMatrix<IRange>;
@@ -102,6 +99,12 @@ export declare class SpreadsheetSkeleton extends Skeleton {
     setOverflowCache(value: ObjectMatrix<IRange>): void;
     setMarginLeft(left: number): void;
     setMarginTop(top: number): void;
+    getFont(rowIndex: number, columnIndex: number): Nullable<IFontCacheItem>;
+    /**
+     * Get range in visible area (range in viewbounds) and set into this._rowColumnSegment.
+     * @param bounds
+     * @returns boolean
+     */
     calculateSegment(bounds?: IViewportInfo): boolean;
     calculateWithoutClearingCache(bounds?: IViewportInfo): Nullable<SpreadsheetSkeleton>;
     calculate(bounds?: IViewportInfo): Nullable<SpreadsheetSkeleton>;
@@ -236,10 +239,19 @@ export declare class SpreadsheetSkeleton extends Skeleton {
     private _getOverflowBound;
     intersectMergeRange(row: number, column: number): boolean;
     private _calculateStylesCache;
+    /**
+     * Any changes to sheet model would reset cache.
+     */
     private _resetCache;
     resetCache(): void;
     private _makeDocumentSkeletonDirty;
-    private _setCellStylesCache;
+    /**
+     * Set border background and font to this._stylesCache { border font background }
+     * @param row {number}
+     * @param col {number}
+     * @param options {{ mergeRange: IRange; cacheItem: ICacheItem } | undefined}
+     */
+    private _setStylesCache;
     private _updateConfigAndGetDocumentModel;
     private _getDocumentDataByStyle;
     /**
@@ -250,10 +262,12 @@ 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.
      * @param mergeData all marge data
-     * @param rowColumnSegment current screen range, include row and column
+     * @param range current screen range, include row and column
      */
     private _getMergeCells;
 }

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

@@ -1,14 +1,15 @@
 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 { UniverRenderingContext } from '../../context';
-import { Documents } from '../docs/document';
+import { UniverRenderingContext2D } from '../../context';
+import { Scene } from '../../scene';
 import { Background } from './extensions/background';
 import { Border } from './extensions/border';
 import { Font } from './extensions/font';
-import { SheetComponent } from './sheet-component';
 import { SpreadsheetSkeleton } from './sheet-skeleton';
-import { IPaintForRefresh, IPaintForScrolling, SHEET_VIEWPORT_KEY } from './interfaces';
 export declare class Spreadsheet extends SheetComponent {
     private _allowCache;
     private _backgroundExtension;
@@ -35,7 +36,14 @@ export declare class Spreadsheet extends SheetComponent {
      * @param ctx
      * @param viewportInfo
      */
-    draw(ctx: UniverRenderingContext, viewportInfo: IViewportInfo): void;
+    draw(ctx: UniverRenderingContext2D, viewportInfo: IViewportInfo): void;
+    addRenderFrameTimeMetricToScene(timeKey: string, val: number, scene: Scene): void;
+    addRenderTagToScene(renderKey: string, val: any, scene?: Scene): void;
+    /**
+     * override for return type as Scene.
+     * @returns Scene
+     */
+    getScene(): Scene;
     isHit(coord: Vector2): boolean;
     getNoMergeCellPositionByIndex(rowIndex: number, columnIndex: number): {
         startY: number;
@@ -61,13 +69,13 @@ export declare class Spreadsheet extends SheetComponent {
      */
     makeDirty(state?: boolean): this;
     setDirtyArea(dirtyBounds: IBoundRectNoAngle[]): void;
-    renderByViewport(mainCtx: UniverRenderingContext, viewportInfo: IViewportInfo, spreadsheetSkeleton: SpreadsheetSkeleton): void;
+    renderByViewport(mainCtx: UniverRenderingContext2D, viewportInfo: IViewportInfo, spreadsheetSkeleton: SpreadsheetSkeleton): void;
     paintNewAreaForScrolling(viewportInfo: IViewportInfo, param: IPaintForScrolling): void;
     /**
      * Redraw the entire viewport.
      */
     refreshCacheCanvas(viewportInfo: IViewportInfo, param: IPaintForRefresh): void;
-    render(mainCtx: UniverRenderingContext, viewportInfo: IViewportInfo): this | undefined;
+    render(mainCtx: UniverRenderingContext2D, viewportInfo: IViewportInfo): this | undefined;
     /**
      * applyCache from cache canvas
      * @param cacheCanvas Source Image
@@ -81,8 +89,8 @@ export declare class Spreadsheet extends SheetComponent {
      * @param dw
      * @param dh
      */
-    protected _applyCache(cacheCanvas: Canvas, ctx: UniverRenderingContext, sx?: number, sy?: number, sw?: number, sh?: number, dx?: number, dy?: number, dw?: number, dh?: number): void;
-    protected _draw(ctx: UniverRenderingContext, bounds?: IViewportInfo): void;
+    protected _applyCache(cacheCanvas: Canvas, ctx: UniverRenderingContext2D, sx?: number, sy?: number, sw?: number, sh?: number, dx?: number, dy?: number, dw?: number, dh?: number): void;
+    protected _draw(ctx: UniverRenderingContext2D, bounds?: IViewportInfo): void;
     private _getAncestorSize;
     private _getAncestorParent;
     private _initialDefaultExtension;
@@ -98,6 +106,6 @@ export declare class Spreadsheet extends SheetComponent {
     private _clearBackground;
     sheetContentViewport(): SHEET_VIEWPORT_KEY[];
     sheetHeaderViewport(): SHEET_VIEWPORT_KEY[];
-    testShowRuler(cacheCtx: UniverRenderingContext, viewportInfo: IViewportInfo): void;
+    testShowRuler(cacheCtx: UniverRenderingContext2D, viewportInfo: IViewportInfo): void;
     testGetRandomLightColor(): string;
 }

package/lib/types/components/slides/slide.d.ts

@@ -17,7 +17,7 @@ export declare class Slide extends SceneViewer {
      */
     addPageScene(pageScene: Scene): void;
     changePage(id?: string): void;
-    hasPage(key: string): import('../../thin-scene').ThinScene | undefined;
+    hasPage(key: string): import('../..').ThinScene | undefined;
     addNavigation(): void;
     removeNavigation(): void;
     enableNav(): void;

package/lib/types/context.d.ts

@@ -15,9 +15,14 @@
  */
 export declare class UniverRenderingContext2D implements CanvasRenderingContext2D {
     __mode: string;
+    private _system;
+    private _browser;
     readonly canvas: HTMLCanvasElement;
     _context: CanvasRenderingContext2D;
+    private _systemType;
+    private _browserType;
     constructor(context: CanvasRenderingContext2D);
+    isContextLost(): boolean;
     get globalAlpha(): number;
     set globalAlpha(val: number);
     get globalCompositeOperation(): GlobalCompositeOperation;
@@ -151,6 +156,8 @@ export declare class UniverRenderingContext2D implements CanvasRenderingContext2
      * @method
      */
     closePath(): void;
+    getSystemType(): string;
+    getBrowserType(): string;
     /**
      * Chrome hardware acceleration causes canvas stroke to fail to draw lines on Mac.
      */

package/lib/types/controllers/config.schema.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 PLUGIN_CONFIG_KEY = "engine-render.config";
+export declare const configSymbol: unique symbol;
+export interface IUniverEngineRenderConfig {
+}
+export declare const defaultPluginConfig: IUniverEngineRenderConfig;

package/lib/types/engine.d.ts

@@ -1,22 +1,33 @@
-import { Observable } from 'rxjs';
-import { CURSOR_TYPE } from './basics/const';
+import { Observable, Subject } from 'rxjs';
 import { Canvas, CanvasRenderMode } from './canvas';
-import { Scene } from './scene';
 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';
 export declare class Engine extends ThinEngine<Scene> {
     renderEvenInBackground: boolean;
     private readonly _beginFrame$;
-    readonly beginFrame$: Observable<void>;
+    readonly beginFrame$: Observable<number>;
     private readonly _endFrame$;
-    readonly endFrame$: Observable<void>;
+    readonly endFrame$: Observable<IBasicFrameInfo>;
+    readonly renderFrameTimeMetric$: Subject<ITimeMetric>;
+    readonly renderFrameTags$: Subject<[string, any]>;
+    /**
+     * time when render start, for elapsedTime
+     */
+    private _renderStartTime;
     private _rect$;
     get clientRect$(): Observable<void>;
     private _container;
     private _canvas;
     private _renderingQueueLaunched;
-    private _activeRenderLoops;
+    private _renderFrameTasks;
     private _renderFunction;
     private _requestNewFrameHandler;
+    /**
+     * frameCount
+     */
     private _frameId;
     private _usingSafari;
     private _resizeObserver;
@@ -44,6 +55,8 @@ export declare class Engine extends ThinEngine<Scene> {
     private _previousWidth;
     private _previousHeight;
     constructor(elemWidth?: number, elemHeight?: number, pixelRatio?: number, mode?: CanvasRenderMode);
+    _init(): void;
+    get elapsedTime(): number;
     get width(): number;
     get height(): number;
     get requestNewFrameHandler(): number;
@@ -70,8 +83,10 @@ export declare class Engine extends ThinEngine<Scene> {
      */
     resizeBySize(width: number, height: number): void;
     dispose(): void;
+    addFunction2RenderLoop(renderFunction: () => void): void;
+    startRenderLoop(): void;
     /**
-     * Register and execute a render loop. The engine can have more than one render function
+     * Register and execute a render loop. The engine could manage more than one render function
      * @param renderFunction defines the function to continuously execute
      */
     runRenderLoop(renderFunction: () => void): void;
@@ -83,11 +98,11 @@ export declare class Engine extends ThinEngine<Scene> {
     /**
      * Begin a new frame
      */
-    beginFrame(): void;
+    _beginFrame(_timestamp: number): void;
     /**
      * End the current frame
      */
-    endFrame(): void;
+    _endFrame(timestamp: number): void;
     /**
      * Gets the current framerate
      * @returns a number representing the framerate
@@ -98,11 +113,17 @@ export declare class Engine extends ThinEngine<Scene> {
      * @returns a number representing the delta time in ms
      */
     getDeltaTime(): number;
-    _renderFrame(): void;
+    /**
+     * Exec all function in _renderFrameTasks
+     */
+    private _renderFrame;
     private _cancelFrame;
     private _getHostWindow;
-    private _renderLoop;
-    private _measureFps;
+    /**
+     * call itself by raf
+     * Exec all function in _renderFrameTasks in _renderFrame()
+     */
+    private _renderFunctionCore;
     private _handleKeyboardAction;
     private _handlePointerAction;
     private _handleDragAction;

package/lib/types/index.d.ts

@@ -15,43 +15,36 @@
  */
 export * from './base-object';
 export * from './basics';
+export { getOffsetRectForDom } from './basics/position';
 export * from './canvas';
 export * from './components';
+export { DocBackground } from './components/docs/doc-background';
+export { Documents } from './components/docs/document';
+export type { IPageRenderConfig } from './components/docs/document';
+export type { IDocumentOffsetConfig } from './components/docs/document';
+export { getTableIdAndSliceIndex } from './components/docs/layout/block/table';
+export { DocumentSkeleton } from './components/docs/layout/doc-skeleton';
+export type { IFindNodeRestrictions } from './components/docs/layout/doc-skeleton';
+export { getCharSpaceApply, getLastLine, getNumberUnitValue, getPageFromPath, glyphIterator, lineIterator } from './components/docs/layout/tools';
+export { Liquid } from './components/docs/liquid';
+export { DataStreamTreeNode } from './components/docs/view-model/data-stream-tree-node';
+export { DocumentViewModel } from './components/docs/view-model/document-view-model';
+export { DocumentEditArea } from './components/docs/view-model/document-view-model';
+export { parseDataStreamToTree } from './components/docs/view-model/document-view-model';
+export { DEFAULT_PADDING_DATA } from './components/sheets/sheet-skeleton';
 export * from './context';
 export * from './custom';
 export * from './engine';
 export * from './group';
 export * from './layer';
 export { IRenderingEngine, UniverRenderEnginePlugin } from './render-engine';
-export { type RenderComponentType, IRenderManagerService, RenderManagerService } from './render-manager/render-manager.service';
-export { RenderUnit, type IRender, type IRenderModule, type IRenderContext } from './render-manager/render-unit';
+export { IRenderManagerService, type RenderComponentType, RenderManagerService } from './render-manager/render-manager.service';
+export { type IRender, type IRenderContext, type IRenderModule, RenderUnit } from './render-manager/render-unit';
 export * from './scene';
+export { type IChangeObserverConfig } from './scene.transformer';
 export * from './scene-viewer';
 export * from './scroll-timer';
 export * from './shape';
-export * from './viewport';
-export { DocumentViewModel } from './components/docs/view-model/document-view-model';
-export { getAnchorBounding, TEXT_RANGE_LAYER_INDEX, TextRange, getLineBounding } from './components/docs/text-selection/text-range';
-export { RectRange, convertPositionsToRectRanges } from './components/docs/text-selection/rect-range';
-export { NodePositionConvertToCursor } from './components/docs/text-selection/convert-text-range';
-export { Liquid } from './components/docs/liquid';
-export { getCanvasOffsetByEngine } from './components/docs/text-selection/selection-utils';
-export { ITextSelectionRenderManager, TextSelectionRenderManager, } from './components/docs/text-selection/text-selection-render-manager';
-export type { IActiveTextRange, IEditorInputConfig, ITextSelectionInnerParam } from './components/docs/text-selection/text-selection-render-manager';
-export { Documents } from './components/docs/document';
-export { DocBackground } from './components/docs/doc-background';
-export type { IPageRenderConfig } from './components/docs/document';
-export { DocumentSkeleton } from './components/docs/layout/doc-skeleton';
 export { ThinEngine } from './thin-engine';
-export { getCharSpaceApply, getNumberUnitValue } from './components/docs/layout/tools';
-export { type IChangeObserverConfig } from './scene.transformer';
-export { DEFAULT_PADDING_DATA } from './components/sheets/sheet-skeleton';
-export { DocumentEditArea } from './components/docs/view-model/document-view-model';
-export { lineIterator, glyphIterator } from './components/docs/layout/tools';
-export { getOneTextSelectionRange } from './components/docs/text-selection/convert-text-range';
-export { getLastLine } from './components/docs/layout/tools';
-export { DataStreamTreeNode } from './components/docs/view-model/data-stream-tree-node';
-export type { IDocRange } from './components/docs/text-selection/range-interface';
-export { isInSameTableCell, isValidRectRange, NodePositionConvertToRectRange } from './components/docs/text-selection/convert-rect-range';
-export { parseDataStreamToTree } from './components/docs/view-model/document-view-model';
-export { DOC_RANGE_TYPE } from './components/docs/text-selection/range-interface';
+export { ThinScene } from './thin-scene';
+export * from './viewport';

package/lib/types/render-engine.d.ts

@@ -1,11 +1,14 @@
-import { Injector, Plugin } from '@univerjs/core';
+import { IConfigService, Injector, Plugin } from '@univerjs/core';
 import { Engine } from './engine';
+import { IUniverEngineRenderConfig } from './controllers/config.schema';
 /**
  * The global rendering engine.
  */
-export declare const IRenderingEngine: import('@univerjs/core').IdentifierDecorator<Engine>;
+export declare const IRenderingEngine: import('@wendellhu/redi').IdentifierDecorator<Engine>;
 export declare class UniverRenderEnginePlugin extends Plugin {
+    private readonly _config;
     readonly _injector: Injector;
+    private readonly _configService;
     static pluginName: string;
-    constructor(_config: undefined, _injector: Injector);
+    constructor(_config: Partial<IUniverEngineRenderConfig> | undefined, _injector: Injector, _configService: IConfigService);
 }

package/lib/types/render-manager/render-manager.service.d.ts

@@ -1,11 +1,11 @@
-import { Dependency, DependencyIdentifier, IDisposable, Nullable, UnitModel, UnitType, Disposable, Injector, IUniverInstanceService, UniverInstanceType } from '@univerjs/core';
+import { Disposable, Injector, IUniverInstanceService, UniverInstanceType, Dependency, DependencyIdentifier, IDisposable, Nullable, UnitModel, UnitType } from '@univerjs/core';
 import { Observable } from 'rxjs';
+import { Engine } from '../engine';
+import { IRender, RenderUnit } from './render-unit';
 import { BaseObject } from '../base-object';
 import { DocComponent } from '../components/docs/doc-component';
 import { SheetComponent } from '../components/sheets/sheet-component';
 import { Slide } from '../components/slides/slide';
-import { Engine } from '../engine';
-import { IRender, RenderUnit } from './render-unit';
 export type RenderComponentType = SheetComponent | DocComponent | Slide | BaseObject;
 export interface IRenderManagerService extends IDisposable {
     /** @deprecated */
@@ -102,7 +102,7 @@ export declare class RenderManagerService extends Disposable implements IRenderM
      * @param isMainScene
      * @returns renderUnit:IRender
      */
-    private _createRender;
+    protected _createRender(unitId: string, engine: Engine, isMainScene?: boolean): IRender;
     addRender(unitId: string, renderUnit: IRender): void;
     private _addRenderUnit;
     removeRender(unitId: string): void;
@@ -119,5 +119,5 @@ export declare class RenderManagerService extends Disposable implements IRenderM
     getRenderAll(): Map<string, IRender>;
     private _disposeItem;
 }
-export declare const IRenderManagerService: import('@univerjs/core').IdentifierDecorator<IRenderManagerService>;
+export declare const IRenderManagerService: import('@wendellhu/redi').IdentifierDecorator<IRenderManagerService>;
 export declare function isDisposable(thing: unknown): thing is IDisposable;

package/lib/types/scene.d.ts

@@ -1,18 +1,18 @@
 import { Nullable } from '@univerjs/core';
-import { BaseObject } from './base-object';
 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';
+import { ITransformerConfig } from './basics/transformer-config';
 import { Vector2 } from './basics/vector2';
 import { UniverRenderingContext } from './context';
-import { Layer } from './layer';
-import { Transformer } from './scene.transformer';
+import { Engine } from './engine';
 import { SceneViewer } from './scene-viewer';
 import { ThinEngine } from './thin-engine';
-import { ThinScene } from './thin-scene';
 import { Viewport } from './viewport';
-import { ITransformerConfig } from './basics/transformer-config';
-import { Engine } from './engine';
 export declare class Scene extends ThinScene {
     private _parent;
     private _layers;
@@ -68,6 +68,7 @@ export declare class Scene extends ThinScene {
     getEngine(): Nullable<Engine>;
     getLayers(): Layer[];
     getLayer(zIndex?: number): Layer;
+    findLayerByZIndex(zIndex?: number): Nullable<Layer>;
     getLayerMaxZIndex(): number;
     addLayer(...argument: Layer[]): void;
     /**
@@ -173,7 +174,12 @@ export declare class Scene extends ThinScene {
         scaleY: number;
     };
     dispose(): void;
-    pick(vec: Vector2): Nullable<BaseObject | Scene | ThinScene>;
+    /**
+     * Get the object under the pointer, if scene.event is disabled, the object is null.
+     * @param {Vector2} coord
+     * @return {Nullable<BaseObject | Scene | ThinScene>} object under the pointer
+     */
+    pick(coord: Vector2): Nullable<BaseObject | Scene | ThinScene>;
     triggerKeyDown(evt: IKeyboardEvent): void;
     triggerKeyUp(evt: IKeyboardEvent): void;
     triggerPointerUp(evt: IPointerEvent | IMouseEvent): boolean;

package/lib/types/scene.input-manager.d.ts

@@ -11,6 +11,7 @@ export declare class InputManager extends Disposable {
     static TripleClickDelay: number;
     /** If you need to check double click without raising a single click at first click, enable this flag */
     static ExclusiveDoubleClickMode: boolean;
+    private _scene;
     /** This is a defensive check to not allow control attachment prior to an already active one. If already attached, previous control is unattached before attaching the new one. */
     private _alreadyAttached;
     private _onInput$;
@@ -28,7 +29,6 @@ export declare class InputManager extends Disposable {
     private _onDragLeave;
     private _onDragOver;
     private _onDrop;
-    private _scene;
     private _currentMouseEnterPicked;
     private _startingPosition;
     private _delayedTimeout;
@@ -48,7 +48,13 @@ export declare class InputManager extends Disposable {
      * Detaches all event handlers
      */
     detachControl(): void;
-    private _getCurrentObject;
+    /**
+     * Just call this._scene?.pick, nothing special.
+     * @param offsetX
+     * @param offsetY
+     * @returns
+     */
+    private _getObjectAtPos;
     private _checkDirectSceneEventTrigger;
     /**
      * @hidden

package/lib/types/scroll-timer.d.ts

@@ -19,6 +19,9 @@ export declare class ScrollTimer {
     private _moveY;
     private _scrollX;
     private _scrollY;
+    /**
+     * Custmize scroll function.
+     */
     private _scrollFunction;
     constructor(_scene: Scene, _scrollTimerType?: ScrollTimerType, _padding?: IPaddingData | undefined);
     static create(scene: any, scrollTimerType?: ScrollTimerType, padding?: IPaddingData): ScrollTimer;
@@ -27,7 +30,7 @@ export declare class ScrollTimer {
     setActiveViewport(viewport: Viewport): void;
     getActiveViewport(): any;
     startScroll(offsetX: number, offsetY: number, targetViewport?: any): void;
-    private _scroll;
+    private _autoScroll;
     scrolling(offsetX: number, offsetY: number, scrollFunction: (x?: number, y?: number) => void): void;
     stopScroll(): void;
     dispose(): void;

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

@@ -1,19 +1,28 @@
-import { UniverRenderingContext } from '../context';
-import { IViewportInfo } from '../basics/vector2';
+import { Nullable } from '@univerjs/core';
 import { ObjectType } from '../base-object';
-import { IShapeProps, Shape } from './shape';
+import { Shape, IShapeProps } from './shape';
+import { UniverRenderingContext } from '../context';
 export interface IRectProps extends IShapeProps {
     radius?: number;
+    visualHeight?: number;
+    visualWidth?: number;
 }
 export declare const RECT_OBJECT_ARRAY: string[];
 export declare class Rect<T extends IRectProps = IRectProps> extends Shape<T> {
-    private _radius;
     objectType: ObjectType;
+    private _radius;
+    /**
+     * For rendering, in many case object size is bigger than visual size for better user interaction.
+     */
+    private _visualHeight;
+    private _visualWidth;
     constructor(key?: string, props?: T);
+    get visualHeight(): Nullable<number>;
+    get visualWidth(): Nullable<number>;
     get radius(): number;
-    static drawWith(ctx: UniverRenderingContext, props: IRectProps | Rect): void;
+    static drawWith(ctx: UniverRenderingContext, props: IRectProps): void;
     toJson(): {
         [x: string]: any;
     };
-    protected _draw(ctx: UniverRenderingContext, viewportInfo?: IViewportInfo): void;
+    protected _draw(ctx: UniverRenderingContext): void;
 }

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

@@ -43,14 +43,19 @@ export declare abstract class ThinScene extends Disposable {
     get scaleX(): number;
     get scaleY(): number;
     get sceneKey(): string;
-    get evented(): boolean;
+    get objectsEvented(): boolean;
     set transform(trans: Transform);
     set width(num: number);
     set height(num: number);
     set scaleX(scaleX: number);
     set scaleY(scaleY: number);
-    enableEvent(): void;
-    disableEvent(): void;
+    enableObjectsEvent(): void;
+    /**
+     * If scene.event is disabled, scene.pick(curosrPos) return null.
+     * Then only scene itself can response to pointer event, all objects under the scene would not.
+     * see sceneInputManager@_onPointerMove
+     */
+    disableObjectsEvent(): void;
     triggerKeyDown(evt: IKeyboardEvent): void;
     triggerKeyUp(evt: IKeyboardEvent): void;
     abstract triggerPointerUp(evt: IPointerEvent | IMouseEvent): void;