@univerjs/engine-render 0.2.11 → 0.2.13

package/lib/types/viewport.d.ts

@@ -1,8 +1,8 @@
-import { EventState, IPosition, Nullable, EventSubject } from '@univerjs/core';
+import { EventSubject, EventState, IPosition, Nullable } from '@univerjs/core';
+import { Transform } from './basics/transform';
+import { Vector2, IBoundRectNoAngle, IViewportInfo } from './basics/vector2';
 import { BaseObject } from './base-object';
 import { IWheelEvent } from './basics/i-events';
-import { Transform } from './basics/transform';
-import { IBoundRectNoAngle, IViewportInfo, Vector2 } from './basics/vector2';
 import { UniverRenderingContext } from './context';
 import { BaseScrollBar } from './shape/base-scroll-bar';
 import { ThinScene } from './thin-scene';
@@ -20,8 +20,8 @@ interface IViewProps extends IViewPosition {
     isWheelPreventDefaultX?: boolean;
     isWheelPreventDefaultY?: boolean;
     active?: boolean;
-    isRelativeX?: boolean;
-    isRelativeY?: boolean;
+    explicitViewportWidthSet?: boolean;
+    explicitViewportHeightSet?: boolean;
     allowCache?: boolean;
     bufferEdgeX?: number;
     bufferEdgeY?: number;
@@ -73,8 +73,6 @@ export declare class Viewport {
     private _viewportScrollY;
     private _preViewportScrollX;
     private _preViewportScrollY;
-    private _deltaViewportScrollX;
-    private _deltaViewportScrollY;
     /**
      * scene size in current viewport port with scale
      * scene size relative to row col settings.
@@ -128,8 +126,18 @@ export declare class Viewport {
      */
     private _paddingStartY;
     private _paddingEndY;
-    private _isRelativeX;
-    private _isRelativeY;
+    /**
+     * Usually for viewport by after freeze, _explicitViewportWidthSet true means viewport's width is specify explicitly.
+     * ex: ViewMainLeft _explicitViewportWidthSet is true when freeze at a certain col, the width of viewMainLeft is decided by freeze line.
+     * Usually this prop is false for viewMain, viewport width is decided by engine size - freeze line
+     */
+    private _explicitViewportWidthSet;
+    /**
+     * _explicitViewportHeightSet true means viewport's height is specify explicitly.
+     * Used for viewport by after freeze.
+     * ex: ViewMainTop _explicitViewportHeightSet is true when freeze at a certain row, the height of viewMainTop is decided by freeze line.
+     */
+    private _explicitViewportHeightSet;
     /**
      * viewbound of cache area, cache area is slightly bigger than viewbound.
      */
@@ -178,7 +186,7 @@ export declare class Viewport {
     get isWheelPreventDefaultX(): boolean;
     get isWheelPreventDefaultY(): boolean;
     set width(w: Nullable<number>);
-    set height(h: Nullable<number>);
+    set height(height: Nullable<number>);
     get isActive(): boolean;
     set viewportScrollX(val: number);
     get viewportScrollX(): number;
@@ -193,6 +201,10 @@ export declare class Viewport {
     set cacheBound(val: IBoundRectNoAngle | null);
     get preCacheBound(): IBoundRectNoAngle | null;
     set preCacheBound(val: IBoundRectNoAngle | null);
+    get _deltaScrollX(): number;
+    get _deltaScrollY(): number;
+    get _deltaViewportScrollX(): number;
+    get _deltaViewportScrollY(): number;
     enable(): void;
     disable(): void;
     resetCanvasSizeAndUpdateScroll(): void;
@@ -283,6 +295,7 @@ export declare class Viewport {
     getScrollBar(): Nullable<BaseScrollBar>;
     /**
      * Just record state of scroll. This method won't scroll viewport and scrollbar.
+     * TODO: @lumixraku this method is so wierd, viewportMain did not call it, now only called in freeze situation.
      * @param current
      * @returns Viewport
      */
@@ -364,7 +377,7 @@ export declare class Viewport {
      */
     private _scrollToBarPosCore;
     /**
-     *
+     * Scroll to position in viewport.
      * When scroll just in X direction, there is no y definition in scrollVpPos. So scrollVpPos is Partial<IViewportScrollPosition>
      * @param scrollVpPos Partial<IViewportScrollPosition>
      * @param isTrigger
@@ -381,8 +394,7 @@ export declare class Viewport {
     private _diffViewBound;
     private _calcDiffCacheBound;
     private _drawScrollbar;
-    private _setViewportWidthAndHeight;
-    private _getBoundScale;
+    private _setViewportSize;
     /**
      * main canvas element resize
      * called by this.scene.getEngine()?.onTransformChange$.add