@univerjs/engine-render 0.2.12 → 0.2.13

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 { Engine } from './engine';
 import { SceneViewer } from './scene-viewer';
-import { Transformer } from './scene.transformer';
 import { ThinEngine } from './thin-engine';
-import { ThinScene } from './thin-scene';
 import { Viewport } from './viewport';
-import { Engine } from './engine';
 export declare class Scene extends ThinScene {
     private _parent;
     private _layers;

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/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