@univerjs/engine-render 0.2.4 → 0.2.6

package/lib/tr-DXSmP_xl.js

@@ -0,0 +1 @@
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const Tr=["21,11,22,2,032,0044,014",'{"a":[{"a":4,"â":4,"e":4,"ı":4,"i":4,"î":4,"o":4,"ö":4,"u":4,"ü":4,"û":4},0],"â":[{"a":4,"â":4,"e":4,"ı":4,"i":4,"î":4,"o":4,"ö":4,"u":4,"ü":4,"û":4},0],"e":[{"c":[{"e":[{"k":[{".":2}]}]}],"a":4,"â":4,"e":4,"ı":4,"i":4,"î":4,"o":4,"ö":4,"u":4,"ü":4,"û":4},0],"ı":[{"a":4,"â":4,"e":4,"ı":4,"i":4,"î":4,"o":4,"ö":4,"u":4,"ü":4,"û":4},0],"i":[{"a":4,"â":4,"e":4,"ı":4,"i":4,"î":4,"o":4,"ö":4,"u":4,"ü":4,"û":4},0],"î":[{"a":4,"â":4,"e":4,"ı":4,"i":4,"î":4,"o":4,"ö":4,"u":4,"ü":4,"û":4},0],"o":[{"a":4,"â":4,"e":4,"ı":4,"i":4,"î":4,"o":4,"ö":4,"u":4,"ü":4,"û":4},0],"ö":[{"a":4,"â":4,"e":4,"ı":4,"i":4,"î":4,"o":4,"ö":4,"u":4,"ü":4,"û":4},0],"u":[{"a":4,"â":4,"e":4,"ı":4,"i":4,"î":4,"o":4,"ö":4,"u":4,"ü":4,"û":4},0],"ü":[{"a":4,"â":4,"e":4,"ı":4,"i":4,"î":4,"o":4,"ö":4,"u":4,"ü":4,"û":4},0],"û":[{"a":4,"â":4,"e":4,"ı":4,"i":4,"î":4,"o":4,"ö":4,"u":4,"ü":4,"û":4},0],"b":[{"b":3,"c":3,"ç":3,"d":3,"f":3,"g":3,"ğ":3,"h":3,"j":3,"k":3,"l":3,"m":3,"n":3,"p":3,"r":3,"s":3,"ş":3,"t":3,"v":3,"y":3,"z":3},1],"c":[{"b":3,"c":3,"ç":3,"d":3,"f":3,"g":3,"ğ":3,"h":3,"j":3,"k":3,"l":3,"m":3,"n":3,"p":3,"r":3,"s":3,"ş":3,"t":3,"v":3,"y":3,"z":3},1],"ç":[{"b":3,"c":3,"ç":3,"d":3,"f":3,"g":3,"ğ":3,"h":3,"j":3,"k":3,"l":3,"m":3,"n":3,"p":3,"r":3,"s":3,"ş":3,"t":3,"v":3,"y":3,"z":3},1],"d":[{"b":3,"c":3,"ç":3,"d":3,"f":3,"g":3,"ğ":3,"h":3,"j":3,"k":3,"l":3,"m":3,"n":3,"p":3,"r":3,"s":3,"ş":3,"t":3,"v":3,"y":3,"z":3},1],"f":[{"b":3,"c":3,"ç":3,"d":3,"f":3,"g":3,"ğ":3,"h":3,"j":3,"k":3,"l":3,"m":3,"n":3,"p":3,"r":3,"s":3,"ş":3,"t":3,"v":3,"y":3,"z":3},1],"g":[{"b":3,"c":3,"ç":3,"d":3,"f":3,"g":3,"ğ":3,"h":3,"j":3,"k":3,"l":3,"m":3,"n":3,"p":3,"r":3,"s":3,"ş":3,"t":3,"v":3,"y":3,"z":3},1],"ğ":[{"b":3,"c":3,"ç":3,"d":3,"f":3,"g":3,"ğ":3,"h":3,"j":3,"k":3,"l":3,"m":3,"n":3,"p":3,"r":3,"s":3,"ş":3,"t":3,"v":3,"y":3,"z":3},1],"h":[{"b":3,"c":3,"ç":3,"d":3,"f":3,"g":3,"ğ":3,"h":3,"j":3,"k":3,"l":3,"m":3,"n":3,"p":3,"r":3,"s":3,"ş":3,"t":3,"v":3,"y":3,"z":3},1],"j":[{"b":3,"c":3,"ç":3,"d":3,"f":3,"g":3,"ğ":3,"h":3,"j":3,"k":3,"l":3,"m":3,"n":3,"p":3,"r":3,"s":3,"ş":3,"t":3,"v":3,"y":3,"z":3},1],"k":[{"b":3,"c":3,"ç":3,"d":3,"f":3,"g":3,"ğ":3,"h":3,"j":3,"k":3,"l":3,"m":3,"n":3,"p":3,"r":3,"s":3,"ş":3,"t":3,"v":3,"y":3,"z":3},1],"l":[{"b":3,"c":3,"ç":3,"d":3,"f":3,"g":3,"ğ":3,"h":3,"j":3,"k":3,"l":3,"m":3,"n":3,"p":3,"r":3,"s":3,"ş":3,"t":3,"v":3,"y":3,"z":3},1],"m":[{"b":3,"c":3,"ç":3,"d":3,"f":3,"g":3,"ğ":3,"h":3,"j":3,"k":3,"l":3,"m":3,"n":3,"p":3,"r":3,"s":3,"ş":3,"t":[{"r":[{"a":[{"k":6}]}]},3],"v":3,"y":3,"z":3},1],"n":[{"b":3,"c":3,"ç":3,"d":3,"f":3,"g":3,"ğ":3,"h":3,"j":3,"k":3,"l":3,"m":3,"n":3,"p":3,"r":3,"s":3,"ş":3,"t":3,"v":3,"y":3,"z":3},1],"p":[{"b":3,"c":3,"ç":3,"d":3,"f":3,"g":3,"ğ":3,"h":3,"j":3,"k":3,"l":3,"m":3,"n":3,"p":3,"r":3,"s":3,"ş":3,"t":3,"v":3,"y":3,"z":3},1],"r":[{"b":3,"c":3,"ç":3,"d":3,"f":3,"g":3,"ğ":3,"h":3,"j":3,"k":3,"l":3,"m":3,"n":3,"p":3,"r":3,"s":3,"ş":3,"t":3,"v":3,"y":3,"z":3},1],"s":[{"b":3,"c":3,"ç":3,"d":3,"f":3,"g":3,"ğ":3,"h":3,"j":3,"k":3,"l":3,"m":3,"n":3,"p":3,"r":3,"s":3,"ş":3,"t":3,"v":3,"y":3,"z":3},1],"ş":[{"b":3,"c":3,"ç":3,"d":3,"f":3,"g":3,"ğ":3,"h":3,"j":3,"k":3,"l":3,"m":3,"n":3,"p":3,"r":3,"s":3,"ş":3,"t":3,"v":3,"y":3,"z":3},1],"t":[{"b":3,"c":3,"ç":3,"d":3,"f":3,"g":3,"ğ":3,"h":3,"j":3,"k":3,"l":3,"m":3,"n":3,"p":3,"r":3,"s":3,"ş":3,"t":3,"v":3,"y":3,"z":3,"u":[{"r":[{"k":5}]}]},1],"v":[{"b":3,"c":3,"ç":3,"d":3,"f":3,"g":3,"ğ":3,"h":3,"j":3,"k":3,"l":3,"m":3,"n":3,"p":3,"r":3,"s":3,"ş":3,"t":3,"v":3,"y":3,"z":3},1],"y":[{"b":3,"c":3,"ç":3,"d":3,"f":3,"g":3,"ğ":3,"h":3,"j":3,"k":3,"l":3,"m":3,"n":3,"p":3,"r":3,"s":3,"ş":3,"t":3,"v":3,"y":3,"z":3},1],"z":[{"b":3,"c":3,"ç":3,"d":3,"f":3,"g":3,"ğ":3,"h":3,"j":3,"k":3,"l":3,"m":3,"n":3,"p":3,"r":3,"s":3,"ş":3,"t":3,"v":3,"y":3,"z":3},1]}',[]];exports.Tr=Tr;

package/lib/types/base-object.d.ts

@@ -9,9 +9,18 @@ import { Layer } from './layer';
 import { ITransformerConfig } from './basics/transformer-config';
 
 export declare const BASE_OBJECT_ARRAY: string[];
+export declare enum ObjectType {
+    UNKNOWN = 0,
+    RICH_TEXT = 1,
+    SHAPE = 2,
+    IMAGE = 3,
+    RECT = 4,
+    CIRCLE = 5
+}
 export declare abstract class BaseObject extends Disposable {
     groupKey?: string;
     isInGroup: boolean;
+    objectType: ObjectType;
     onTransformChange$: EventSubject<ITransformChangeState>;
     onPointerDown$: EventSubject<IMouseEvent | IPointerEvent>;
     onPointerMove$: EventSubject<IMouseEvent | IPointerEvent>;

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

@@ -1,4 +1,4 @@
-import { BulletAlignment, ColumnSeparatorType, DataStreamTreeTokenType, IDocDrawingBase, IDocumentRenderConfig, IIndentStart, INestingLevel, ITextStyle, PageOrientType } from '@univerjs/core';
+import { BulletAlignment, ColumnSeparatorType, DataStreamTreeTokenType, IDocDrawingBase, IDocumentRenderConfig, INestingLevel, IParagraphProperties, ITextStyle, PageOrientType } from '@univerjs/core';
 import { BreakPointType } from '../components/docs/layout/line-breaker/break';
 
 export interface IDocumentSkeletonCached extends ISkeletonResourceReference {
@@ -134,7 +134,7 @@ export interface IDocumentSkeletonGlyph {
     featureId?: string;
     drawingId?: string;
 }
-export interface IDocumentSkeletonBullet extends IIndentStart {
+export interface IDocumentSkeletonBullet {
     listId: string;
     symbol: string;
     ts: ITextStyle;
@@ -144,6 +144,7 @@ export interface IDocumentSkeletonBullet extends IIndentStart {
     nestingLevel?: INestingLevel;
     bulletAlign?: BulletAlignment;
     bulletType?: boolean;
+    paragraphProperties?: IParagraphProperties;
 }
 export interface IDocumentSkeletonDrawing {
     drawingId: string;

package/lib/types/components/component.d.ts

@@ -1,4 +1,4 @@
-import { IDisposable } from '@wendellhu/redi';
+import { IDisposable } from '@univerjs/core';
 import { BaseObject } from '../base-object';
 import { IViewportInfo } from '../basics/vector2';
 import { UniverRenderingContext } from '../context';

package/lib/types/components/docs/layout/hyphenation/hyphen.d.ts

@@ -1,4 +1,4 @@
-import { IDisposable } from '@wendellhu/redi';
+import { IDisposable } from '@univerjs/core';
 import { Lang } from './lang';
 
 export declare class Hyphen implements IDisposable {

package/lib/types/components/docs/layout/hyphenation/language-detector.d.ts

@@ -1,4 +1,4 @@
-import { IDisposable } from '@wendellhu/redi';
+import { IDisposable } from '@univerjs/core';
 import { Lang } from './lang';
 
 export declare class LanguageDetector implements IDisposable {

package/lib/types/components/docs/text-selection/text-selection-render-manager.d.ts

@@ -68,6 +68,8 @@ export interface ITextSelectionRenderManager {
     hasFocus(): boolean;
     focus(): void;
     blur(): void;
+    focusEditor(): void;
+    blurEditor(): void;
     changeRuntime(docSkeleton: DocumentSkeleton, scene: Scene, document: Documents): void;
     dispose(): void;
     handleDblClick(evt: IPointerEvent | IMouseEvent): void;
@@ -126,6 +128,7 @@ export declare class TextSelectionRenderManager extends RxDisposable implements
     private _document;
     private _scenePointerMoveSubs;
     private _scenePointerUpSubs;
+    private _editorFocusing;
     constructor(_logService: ILogService);
     __getEditorContainer(): HTMLElement;
     getViewPort(): Viewport;
@@ -146,6 +149,8 @@ export declare class TextSelectionRenderManager extends RxDisposable implements
     hasFocus(): boolean;
     focus(): void;
     blur(): void;
+    focusEditor(): void;
+    blurEditor(): void;
     deactivate(): void;
     changeRuntime(docSkeleton: DocumentSkeleton, scene: Scene, document: Documents): void;
     handleDblClick(evt: IPointerEvent | IMouseEvent): void;
@@ -176,7 +181,8 @@ export declare class TextSelectionRenderManager extends RxDisposable implements
     private _eventHandle;
     private _getTransformCoordForDocumentOffset;
     private _findNodeByCoord;
+    private _getNodeIndex;
     private _detachEvent;
     private _activeSelectionRefresh;
 }
-export declare const ITextSelectionRenderManager: import('@wendellhu/redi').IdentifierDecorator<TextSelectionRenderManager>;
+export declare const ITextSelectionRenderManager: import('@univerjs/core').IdentifierDecorator<TextSelectionRenderManager>;

package/lib/types/components/docs/view-model/document-view-model.d.ts

@@ -1,5 +1,4 @@
-import { ICustomDecorationForInterceptor, ICustomRangeForInterceptor, IDocumentBody, ITextRun, Nullable, DocumentDataModel } from '@univerjs/core';
-import { IDisposable } from '@wendellhu/redi';
+import { ICustomDecorationForInterceptor, ICustomRangeForInterceptor, IDisposable, IDocumentBody, ITextRun, Nullable, DocumentDataModel } from '@univerjs/core';
 import { DataStreamTreeNode } from './data-stream-tree-node';
 
 export interface ICustomRangeInterceptor {

package/lib/types/layer.d.ts

@@ -24,7 +24,7 @@ export declare class Layer extends Disposable {
      * insert o to _objects[]
      * if o is a group, insert all its children and group itself to _objects[]
      * @param o
-     * @returns
+     * @returns this
      */
     addObject(o: BaseObject): this;
     removeObject(object: BaseObject | string): void;

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

@@ -1,11 +1,10 @@
-import { Plugin } from '@univerjs/core';
-import { Injector } from '@wendellhu/redi';
+import { Injector, Plugin } from '@univerjs/core';
 import { Engine } from './engine';
 
 /**
  * The global rendering engine.
  */
-export declare const IRenderingEngine: import('@wendellhu/redi').IdentifierDecorator<Engine>;
+export declare const IRenderingEngine: import('@univerjs/core').IdentifierDecorator<Engine>;
 export declare class UniverRenderEnginePlugin extends Plugin {
     readonly _injector: Injector;
     static pluginName: string;

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

@@ -1,5 +1,4 @@
-import { Nullable, UnitModel, UnitType, UniverInstanceType, Disposable, IUniverInstanceService } from '@univerjs/core';
-import { Dependency, DependencyIdentifier, IDisposable, Injector } from '@wendellhu/redi';
+import { Dependency, DependencyIdentifier, IDisposable, Nullable, UnitModel, UnitType, Disposable, Injector, IUniverInstanceService, UniverInstanceType } from '@univerjs/core';
 import { Observable } from 'rxjs';
 import { BaseObject } from '../base-object';
 import { DocComponent } from '../components/docs/doc-component';
@@ -74,5 +73,5 @@ export declare class RenderManagerService extends Disposable implements IRenderM
     getRenderAll(): Map<string, IRender>;
     private _disposeItem;
 }
-export declare const IRenderManagerService: import('@wendellhu/redi').IdentifierDecorator<IRenderManagerService>;
+export declare const IRenderManagerService: import('@univerjs/core').IdentifierDecorator<IRenderManagerService>;
 export declare function isDisposable(thing: unknown): thing is IDisposable;

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

@@ -1,5 +1,4 @@
-import { Nullable, UnitModel, UnitType, Disposable } from '@univerjs/core';
-import { Dependency, DependencyIdentifier, IDisposable, Injector } from '@wendellhu/redi';
+import { Dependency, DependencyIdentifier, IDisposable, Nullable, UnitModel, UnitType, Disposable, Injector } from '@univerjs/core';
 import { Engine } from '../engine';
 import { Scene } from '../scene';
 import { RenderComponentType } from './render-manager.service';

package/lib/types/scene.transformer.d.ts

@@ -146,6 +146,7 @@ export declare class Transformer extends Disposable implements ITransformerConfi
     private _clearControlMap;
     private _createControl;
     private _getTopScene;
+    activeAnObject(applyObject: BaseObject): void;
     private _updateActiveObjectList;
     private _findGroupObject;
     private _addCancelObserver;

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

@@ -12,8 +12,6 @@ export declare class ScrollTimer {
     private _scene;
     private _scrollTimerType;
     private _padding?;
-    private _smoothRatioX;
-    private _smoothRatioY;
     private _requestNewFrameNumber;
     private _viewport;
     private _offsetX;
@@ -23,7 +21,7 @@ export declare class ScrollTimer {
     private _scrollX;
     private _scrollY;
     private _scrollFunction;
-    constructor(_scene: Scene, _scrollTimerType?: ScrollTimerType, _padding?: IPaddingData | undefined, _smoothRatioX?: number, _smoothRatioY?: number);
+    constructor(_scene: Scene, _scrollTimerType?: ScrollTimerType, _padding?: IPaddingData | undefined);
     static create(scene: any, scrollTimerType?: ScrollTimerType, padding?: IPaddingData): ScrollTimer;
     set scrollTimerType(type: ScrollTimerType);
     get scrollTimerType(): ScrollTimerType;

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

@@ -1,4 +1,5 @@
 import { UniverRenderingContext } from '../context';
+import { ObjectType } from '../base-object';
 import { IShapeProps, Shape } from './shape';
 
 export interface ICircleProps extends IShapeProps {
@@ -7,6 +8,7 @@ export interface ICircleProps extends IShapeProps {
 export declare const CIRCLE_OBJECT_ARRAY: string[];
 export declare class Circle extends Shape<ICircleProps> {
     private _radius;
+    objectType: ObjectType;
     constructor(key?: string, props?: ICircleProps);
     get radius(): number;
     static drawWith(ctx: UniverRenderingContext, props: ICircleProps | Circle): void;

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

@@ -1,6 +1,7 @@
 import { ISrcRect, Nullable, PresetGeometryType } from '@univerjs/core';
 import { UniverRenderingContext } from '../context';
 import { IObjectFullState, IViewportInfo, RENDER_CLASS_TYPE } from '../basics';
+import { ObjectType } from '../base-object';
 import { IShapeProps, Shape } from './shape';
 
 export interface IImageProps extends IShapeProps {
@@ -23,6 +24,7 @@ export declare class Image extends Shape<IImageProps> {
     protected _native: Nullable<HTMLImageElement>;
     private _renderByCropper;
     private _transformCalculateSrcRect;
+    objectType: ObjectType;
     constructor(id: string, config: IImageProps);
     get srcRect(): Nullable<ISrcRect>;
     get prstGeom(): Nullable<PresetGeometryType>;

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

@@ -1,5 +1,6 @@
 import { UniverRenderingContext } from '../context';
 import { IViewportInfo } from '../basics/vector2';
+import { ObjectType } from '../base-object';
 import { IShapeProps, Shape } from './shape';
 
 export interface IRectProps extends IShapeProps {
@@ -8,6 +9,7 @@ export interface IRectProps extends IShapeProps {
 export declare const RECT_OBJECT_ARRAY: string[];
 export declare class Rect<T extends IRectProps = IRectProps> extends Shape<T> {
     private _radius;
+    objectType: ObjectType;
     constructor(key?: string, props?: T);
     get radius(): number;
     static drawWith(ctx: UniverRenderingContext, props: IRectProps | Rect): void;

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

@@ -1,5 +1,5 @@
 import { IDocumentData, IStyleBase, ITransformState, LocaleService } from '@univerjs/core';
-import { BaseObject } from '../base-object';
+import { BaseObject, ObjectType } from '../base-object';
 import { IViewportInfo } from '../basics/vector2';
 import { UniverRenderingContext } from '../context';
 
@@ -25,6 +25,7 @@ export declare class RichText extends BaseObject {
     private _bg?;
     private _bd?;
     private _cl?;
+    objectType: ObjectType;
     constructor(_localeService: LocaleService, key?: string, props?: IRichTextProps);
     get documentData(): IDocumentData;
     getDocsSkeletonPageSize(): {

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

@@ -1,5 +1,5 @@
 import { IOffset, IScale, ISize, Nullable } from '@univerjs/core';
-import { BaseObject } from '../base-object';
+import { BaseObject, ObjectType } from '../base-object';
 import { IObjectFullState } from '../basics/interfaces';
 import { IViewportInfo, Vector2 } from '../basics/vector2';
 import { UniverRenderingContext } from '../context';
@@ -62,6 +62,7 @@ export declare abstract class Shape<T extends IShapeProps> extends BaseObject {
     private _strokeDashOffset;
     private _strokeMiterLimit;
     private _type;
+    objectType: ObjectType;
     constructor(key?: string, props?: T);
     get hoverCursor(): Nullable<string>;
     get moveCursor(): string | null;

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

@@ -1,5 +1,4 @@
-import { Disposable, EventSubject } from '@univerjs/core';
-import { IDisposable } from '@wendellhu/redi';
+import { Disposable, EventSubject, IDisposable } from '@univerjs/core';
 import { CURSOR_TYPE, RENDER_CLASS_TYPE } from './basics/const';
 import { IEvent } from './basics/i-events';
 import { ITransformChangeState } from './basics/interfaces';

package/lib/types/viewport.d.ts

@@ -32,22 +32,30 @@ export interface IScrollObserverParam {
     /**
      * scrollX for scrollbar
      */
-    scrollX?: number;
-    scrollY?: number;
-    x?: number;
-    y?: number;
+    scrollX: number;
+    scrollY: number;
+    /**
+     * scrollXY before limit function
+     * why need this value?
+     */
+    rawScrollX?: number;
+    rawScrollY?: number;
     /**
      * scrollX for viewport
      */
-    viewportScrollX?: number;
-    viewportScrollY?: number;
+    viewportScrollX: number;
+    viewportScrollY: number;
     limitX?: number;
     limitY?: number;
     isTrigger?: boolean;
 }
 interface IScrollBarPosition {
-    x?: number;
-    y?: number;
+    x: number;
+    y: number;
+}
+interface IViewportScrollPosition {
+    viewportScrollX: number;
+    viewportScrollY: number;
 }
 export declare class Viewport {
     /**
@@ -69,14 +77,21 @@ export declare class Viewport {
     private _deltaViewportScrollX;
     private _deltaViewportScrollY;
     /**
-     * physcal scene size (scene width * scale)
+     * scene size in current viewport port with scale
+     * scene size relative to row col settings.
+     * if AB col has set to be freeze, then scene size in viewMain will be smaller compared to no freeze state.
+     */
+    private _sceneWCurrVpAfterScale;
+    private _sceneHCurrVpAfterScale;
+    /**
+     * scene size with scale
      */
-    private _physicalSceneWidth;
-    private _physicalSceneHeight;
+    private _sceneWidthAfterScale;
+    private _sceneHeightAfterScale;
     onMouseWheel$: EventSubject<IWheelEvent>;
     onScrollAfter$: EventSubject<IScrollObserverParam>;
     onScrollBefore$: EventSubject<IScrollObserverParam>;
-    onScrollStop$: EventSubject<IScrollObserverParam>;
+    onScrollEnd$: EventSubject<IScrollObserverParam>;
     onScrollByBar$: EventSubject<IScrollObserverParam>;
     private _viewportKey;
     /**
@@ -105,7 +120,13 @@ export declare class Viewport {
     private _clipViewport;
     private _active;
     private _paddingStartX;
+    /**
+     * after create a freeze column, there is a "padding distace" from row header to curr viewport.
+     */
     private _paddingEndX;
+    /**
+     * after create a freeze row, there is a "padding distace" from column header to curr viewport.
+     */
     private _paddingStartY;
     private _paddingEndY;
     private _isRelativeX;
@@ -179,7 +200,7 @@ export declare class Viewport {
      * invoked when canvas element size change
      * engineResizeObserver --> engine.resizeBySize --> scene._setTransForm
      */
-    resetCanvasSizeAndUpdateScrollBar(): void;
+    resetCanvasSizeAndUpdateScroll(): void;
     setScrollBar(instance: BaseScrollBar): void;
     removeScrollBar(): void;
     /**
@@ -196,69 +217,74 @@ export declare class Viewport {
     setPadding(param: IPosition): void;
     resetPadding(): void;
     /**
-     * set scrollXY and viewportScrollXY, and update scrollInfo without notify listeners of scrollInfo$
-     * mainly call by scroll.render-controller and viewport.resize ...
-     * only viewMain would call scrollTo, other views did not call scroll, see scroll.render-controller
-     * @param pos
+     * There are serval cases to call this method.
+     * the most common case is scrolling. Other situations include:
+     * 1. changing the frozen row & col settings
+     * 2. changing curr skeleton
+     * 3. changing selection which cross viewport
+     * 4. changing the viewport size (also include change window size)
+     * 5. changing the scroll bar position
      *
      * when scrolling by trackpad:
-     * scene.input-manager@_onMouseWheel --> scene@triggerMouseWheel --> sheet-render.controller@scene.onMouseWheelObserver.add --> scrollManagerService.setScrollInfo -->
-     * scroll.render-controller@_scrollManagerService.scrollInfo$.subscribe --> scrollTo
-     * scroll-manager.service@_scrollInfo$.next -->scroll.render-controller@_scrollManagerService.scrollInfo$.subscribe -->
-     * viewportMain.scrollTo(config);
-     *
+     * scene.input-manager@_onMouseWheel --> scene@triggerMouseWheel --> sheet-render.controller@scene.onMouseWheel$.add -->
+     * set-scroll.command.ts --> scroll.operation.ts -->
+     * scrollManagerService.setScrollInfoAndEmitEvent
      *
      * when change skelenton:
-     * _currentSkeletonBefore$ ---> scroll.render-controller@_updateSceneSize --> setSearchParam --> scene@_setTransForm ---> viewport.resetCanvasSizeAndUpdateScrollBar ---> scrollTo ---> _scroll
+     * _currentSkeletonBefore$ ---> scroll.render-controller@_updateSceneSize --> setSearchParam --> scene@_setTransForm ---> viewport.resetCanvasSizeAndUpdateScrollBar ---> scrollToXX
      * --> onScrollAfterObserver.notifyObservers --> scroll.render-controller@onScrollAfterObserver ---> setScrollInfoToCurrSheetWithoutNotify  ---> sms._setScrollInfo
      *
      * _currentSkeleton$ ---> selection.render-controller ---> formula@_autoScroll ---> viewport.resize ---> get scrollXY by viewportScrollXY ---> scrollTo
      * _currentSkeleton$ ---> selection.render-controller ---> setCurrentSelection ---> formula@_autoScroll ---> scrollTo
      * _currentSkeleton$ ---> freeze.render-controller@_refreshFreeze --> viewport.resize ---> scrollTo  ---> _scroll
      *
-     *
-     *
-     * TODO: @lumix many side effects in scrollTo, it would update scrollXY & viewportScrollXY, and notify listeners of scrollInfo$
-     *
-     * TODO: @lumix Other controller should call scrollManagerService to set scrollInfo$
-     * example in scroll.operation.ts
-     *
      * Debug
      * window.scene.getViewports()[0].scrollTo({x: 14.2, y: 1.8}, true)
+     *
+     * @param pos
+     *
      */
-    scrollTo(pos: IScrollBarPosition): {
+    scrollToBarPos(pos: Partial<IScrollBarPosition>): {
+        scrollX: number;
+        scrollY: number;
         isLimitedX: boolean;
         isLimitedY: boolean;
     } | undefined;
     /**
-     * current position plus offset, relative
-     * normally triggered by scroll-timer(in sheet)
-     * @param pos
+     * scrolling by current position plus offset
+     * the most common case is triggered by scroll-timer(in sheet)
+     * @param delta
      * @returns isLimited
      */
-    scrollBy(pos: IScrollBarPosition, isTrigger?: boolean): {
+    scrollByBarDeltaValue(delta: Partial<IScrollBarPosition>, isTrigger?: boolean): {
+        scrollX: number;
+        scrollY: number;
+        isLimitedX: boolean;
+        isLimitedY: boolean;
+    } | undefined;
+    scrollByBar(delta: Partial<IScrollBarPosition>, isTrigger?: boolean): void;
+    scrollToViewportPos(pos: Partial<IViewportScrollPosition>, isTrigger?: boolean): {
+        viewportScrollX: number;
+        viewportScrollY: number;
+        isLimitedX: boolean;
+        isLimitedY: boolean;
+    } | undefined;
+    scrollByViewportDeltaVal(delta: IViewportScrollPosition, isTrigger?: boolean): {
+        viewportScrollX: number;
+        viewportScrollY: number;
         isLimitedX: boolean;
         isLimitedY: boolean;
     } | undefined;
-    /**
-     *
-     * @param pos
-     * @param isTrigger
-     */
-    scrollByBar(pos: IScrollBarPosition, isTrigger?: boolean): void;
-    scrollByViewportScroll({ deltaX, deltaY }: {
-        deltaX?: number | undefined;
-        deltaY?: number | undefined;
-    }): void;
     /**
      * current position plus offset relatively
      * the caller no need to deal with the padding when frozen
      * @param offsetX
      * @param offsetY
      * @param isTrigger
-     * @returns
      */
     scrollByOffset(offsetX?: number, offsetY?: number, isTrigger?: boolean): {
+        scrollX: number;
+        scrollY: number;
         isLimitedX: boolean;
         isLimitedY: boolean;
     } | undefined;
@@ -272,23 +298,21 @@ export declare class Viewport {
     };
     /**
      * get actual scroll value by scrollXY
-     * @returns
      */
-    getViewportScrollByScroll(): {
+    getViewportScrollByScrollXY(): {
         x: number;
         y: number;
     };
     getScrollBar(): Nullable<BaseScrollBar>;
-    updateScroll(current: IScrollObserverParam): this;
+    updateScrollVal(current: Partial<IScrollObserverParam>): this;
     getScrollBarTransForm(): Transform;
     shouldIntoRender(): boolean;
     /**
-     * engine.renderLoop ---> scene.render ---> layer.render ---> viewport.render
+     * call stack: engine.renderLoop ---> scene.render ---> layer.render ---> viewport.render
      * that means each layer call all viewports to render
-     * @param parentCtx 如果 layer._allowCache true, 那么 parentCtx 是 layer 中的 cacheCtx
+     * @param parentCtx parentCtx is cacheCtx from layer when layer._allowCache is true
      * @param objects
      * @param isMaxLayer
-     * @param isLast last viewport would
      */
     render(parentCtx?: UniverRenderingContext, objects?: BaseObject[], isMaxLayer?: boolean): void;
     private _makeDefaultViewport;
@@ -313,10 +337,24 @@ export declare class Viewport {
     openClip(): void;
     closeClip(): void;
     dispose(): void;
-    limitedScroll(): {
+    limitedScroll(scrollX: Nullable<number>, scrollY: Nullable<number>): {
+        scrollX: number;
+        scrollY: number;
         isLimitedX: boolean;
         isLimitedY: boolean;
-    } | undefined;
+    };
+    /**
+     * Still in working progress, do not use it now.
+     * @param viewportScrollX
+     * @param viewportScrollY
+     * @returns
+     */
+    _limitViewportScroll(viewportScrollX: number, viewportScrollY: number): {
+        viewportScrollX: number;
+        viewportScrollY: number;
+        isLimitedX: boolean;
+        isLimitedY: boolean;
+    };
     markDirty(state?: boolean): void;
     get isDirty(): boolean;
     private _isForceDirty;
@@ -328,26 +366,29 @@ export declare class Viewport {
      */
     private _resizeCacheCanvas;
     /**
-     * This method will be invoked whenever the viewport is resized.
+     * This method will be invoked when viewport is resizing and removing rol & col
      */
-    private _updateScrollBarPosByViewportScroll;
+    private _updateScrollByViewportScrollValue;
     private _getViewPortSize;
     /**
      * update pre scroll value has handled in updateScroll()
      */
     private _afterRender;
-    private _triggerScrollStop;
+    private _emitScrollEnd$;
+    /**
+     *
+     * When scroll just in X direction, there is no y definition in scrollXY. So scrollXY is Partial<IScrollBarPosition>
+     * @param rawScrollXY Partial<IViewportScrollPosition>
+     * @param isTrigger
+     */
+    private _scrollToBarPosCore;
     /**
-     * Scroll Viewport
-     * This function called by viewMain only, other viewports will not.
      *
-     * caller: scroll.render-controller viewportMain.scrollTo({x, y}))
-     * this._scrollManagerService.scrollInfo$.subscribe --> scrollTo --> _scroll
-     * @param scrollType
-     * @param scrollBarPos viewMain 滚动条的位置
+     * When scroll just in X direction, there is no y definition in scrollVpPos. So scrollVpPos is Partial<IViewportScrollPosition>
+     * @param scrollVpPos Partial<IViewportScrollPosition>
      * @param isTrigger
      */
-    private _scrollCore;
+    private _scrollToViewportPosCore;
     expandBounds(value: {
         top: number;
         left: number;