Skip to content

Build your own AI office with Univer Office SDK. Bring editing, calculation, collaboration, and file processing into your product for people and AI agents. Built on an extensible open-source core.

refactor: rm thin-engine & thin-scene (#4101)

lumix3f570b5b936e
diff --git a/packages/docs-ui/src/services/selection/rect-range.ts b/packages/docs-ui/src/services/selection/rect-range.ts
index 896a8b0238..bebc075030 100644
--- a/packages/docs-ui/src/services/selection/rect-range.ts
+++ b/packages/docs-ui/src/services/selection/rect-range.ts
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-import type { Documents, DocumentSkeleton, INodePosition, IPoint, ITextSelectionStyle, ThinScene } from '@univerjs/engine-render';
+import type { Documents, DocumentSkeleton, INodePosition, IPoint, ITextSelectionStyle, Scene } from '@univerjs/engine-render';
import type { IDocRange } from './range-interface';
import { COLORS, DOC_RANGE_TYPE, type Nullable, RANGE_DIRECTION, Rectangle, Tools } from '@univerjs/core';
import { getColor, NORMAL_TEXT_SELECTION_PLUGIN_STYLE, RegularPolygon } from '@univerjs/engine-render';
@@ -25,7 +25,7 @@ const RECT_RANGE_KEY_PREFIX = '__DocTableRectRange__';
const ID_LENGTH = 6;
export function convertPositionsToRectRanges(
- scene: ThinScene,
+ scene: Scene,
document: Documents,
docSkeleton: DocumentSkeleton,
anchorNodePosition: INodePosition,
@@ -61,7 +61,7 @@ export class RectRange implements IDocRange {
private _tableId: string;
constructor(
- private _scene: ThinScene,
+ private _scene: Scene,
private _document: Documents,
private _docSkeleton: DocumentSkeleton,
public anchorNodePosition: INodePosition,
diff --git a/packages/docs-ui/src/services/selection/text-range.ts b/packages/docs-ui/src/services/selection/text-range.ts
index d6ea2e5b49..7093f5e6ae 100644
--- a/packages/docs-ui/src/services/selection/text-range.ts
+++ b/packages/docs-ui/src/services/selection/text-range.ts
@@ -15,7 +15,7 @@
*/
import type { ITextRange, Nullable } from '@univerjs/core';
-import type { Documents, DocumentSkeleton, IDocumentSkeletonGlyph, INodePosition, IPoint, ISuccinctDocRangeParam, ITextSelectionStyle, Scene, ThinScene } from '@univerjs/engine-render';
+import type { Documents, DocumentSkeleton, IDocumentSkeletonGlyph, INodePosition, IPoint, ISuccinctDocRangeParam, ITextSelectionStyle, Scene } from '@univerjs/engine-render';
import type { IDocRange } from './range-interface';
import { BooleanNumber, COLORS, DOC_RANGE_TYPE, RANGE_DIRECTION, Tools } from '@univerjs/core';
import { getColor, NORMAL_TEXT_SELECTION_PLUGIN_STYLE, Rect, RegularPolygon } from '@univerjs/engine-render';
@@ -106,7 +106,7 @@ export class TextRange implements IDocRange {
private _anchorBlinkTimer: Nullable<ReturnType<typeof setInterval>> = null;
constructor(
- private _scene: ThinScene,
+ private _scene: Scene,
private _document: Documents,
private _docSkeleton: DocumentSkeleton,
public anchorNodePosition?: Nullable<INodePosition>,
diff --git a/packages/drawing-ui/src/services/drawing-render.service.ts b/packages/drawing-ui/src/services/drawing-render.service.ts
index f667df8e17..b9daa989a1 100644
--- a/packages/drawing-ui/src/services/drawing-render.service.ts
+++ b/packages/drawing-ui/src/services/drawing-render.service.ts
@@ -15,8 +15,8 @@
*/
import type { IDrawingSearch, IImageData } from '@univerjs/drawing';
-import { DrawingTypeEnum, getDrawingShapeKeyByDrawingSearch, IDrawingManagerService, IImageIoService, ImageSourceType } from '@univerjs/drawing';
import type { IImageProps, Scene } from '@univerjs/engine-render';
+import { DrawingTypeEnum, getDrawingShapeKeyByDrawingSearch, IDrawingManagerService, IImageIoService, ImageSourceType } from '@univerjs/drawing';
import { DRAWING_OBJECT_LAYER_INDEX, Image } from '@univerjs/engine-render';
import { insertGroupObject } from '../controllers/utils';
@@ -95,9 +95,9 @@ export class DrawingRenderService {
continue;
}
- const imageObject = scene.addObject(image, DRAWING_OBJECT_LAYER_INDEX);
+ scene.addObject(image, DRAWING_OBJECT_LAYER_INDEX);
if (this._drawingManagerService.getDrawingEditable()) {
- imageObject.attachTransformerTo(image);
+ scene.attachTransformerTo(image);
}
groupId && insertGroupObject({ drawingId: groupId, unitId, subUnitId }, image, scene, this._drawingManagerService);
diff --git a/packages/engine-render/src/base-object.ts b/packages/engine-render/src/base-object.ts
index 8a805c56a1..2c7482d55c 100644
--- a/packages/engine-render/src/base-object.ts
+++ b/packages/engine-render/src/base-object.ts
@@ -795,21 +795,14 @@ export abstract class BaseObject extends Disposable {
getScene(): Nullable<Scene> {
let parent: any = this.parent;
-
- if (parent == null) {
- return null;
- }
-
- if (parent.classType === RENDER_CLASS_TYPE.SCENE) {
- return parent;
- }
-
while (parent) {
if (parent.classType === RENDER_CLASS_TYPE.SCENE) {
return parent;
}
parent = parent.getParent();
}
+
+ return null;
}
resetCursor() {
diff --git a/packages/engine-render/src/components/sheets/spreadsheet.ts b/packages/engine-render/src/components/sheets/spreadsheet.ts
index b9bb7ad12f..7fbcc4c392 100644
--- a/packages/engine-render/src/components/sheets/spreadsheet.ts
+++ b/packages/engine-render/src/components/sheets/spreadsheet.ts
@@ -205,7 +205,7 @@ export class Spreadsheet extends SheetComponent {
const scene = this.getParent() as Scene;
let x = 0;
let y = 0;
- const viewPort = scene.findViewportByPosToViewport(coord);
+ const viewPort = scene.findViewportByPosToScene(coord);
if (viewPort) {
const actualX = viewPort.viewportScrollX || 0;
const actualY = viewPort.viewportScrollY || 0;
diff --git a/packages/engine-render/src/engine.ts b/packages/engine-render/src/engine.ts
index 1d4535d92f..070b08aa5f 100644
--- a/packages/engine-render/src/engine.ts
+++ b/packages/engine-render/src/engine.ts
@@ -15,35 +15,40 @@
*/
import type { Nullable } from '@univerjs/core';
-import type { CURSOR_TYPE } from './basics/const';
-import type { IKeyboardEvent, IPointerEvent } from './basics/i-events';
-import type { ITimeMetric } from './basics/interfaces';
+import type { IEvent, IKeyboardEvent, IPointerEvent } from './basics/i-events';
+import type { ITimeMetric, ITransformChangeState } from './basics/interfaces';
import type { IBasicFrameInfo } from './basics/performance-monitor';
import type { Scene } from './scene';
-import { toDisposable, Tools } from '@univerjs/core';
+import { Disposable, EventSubject, toDisposable, Tools } from '@univerjs/core';
import { Observable, shareReplay, Subject } from 'rxjs';
+import { type CURSOR_TYPE, RENDER_CLASS_TYPE } from './basics/const';
import { DeviceType, PointerInput } from './basics/i-events';
import { TRANSFORM_CHANGE_OBSERVABLE_TYPE } from './basics/interfaces';
import { PerformanceMonitor } from './basics/performance-monitor';
import { getPointerPrefix, getSizeForDom, IsSafari, requestNewFrame } from './basics/tools';
import { Canvas, CanvasRenderMode } from './canvas';
import { observeClientRect } from './floating/util';
-import { ThinEngine } from './thin-engine';
-export class Engine extends ThinEngine<Scene> {
+export class Engine extends Disposable {
renderEvenInBackground = true;
private readonly _beginFrame$ = new Subject<number>();
readonly beginFrame$ = this._beginFrame$.asObservable();
-
private readonly _endFrame$ = new Subject<IBasicFrameInfo>();
readonly endFrame$ = this._endFrame$.asObservable();
readonly renderFrameTimeMetric$ = new Subject<ITimeMetric>();
-
readonly renderFrameTags$ = new Subject<[string, any]>();
+ onInputChanged$ = new EventSubject<IEvent>();
+
+ onTransformChange$ = new EventSubject<ITransformChangeState>();
+
+ private _scenes: { [sceneKey: string]: Scene } = {};
+
+ private _activeScene: Scene | null = null;
+
/**
* time when render start, for elapsedTime
*/
@@ -161,14 +166,55 @@ export class Engine extends ThinEngine<Scene> {
return Tools.now() - this._renderStartTime;
}
- override get width() {
+ get width() {
return this.getCanvas().getWidth();
}
- override get height() {
+ get height() {
return this.getCanvas().getHeight();
}
+ get classType() {
+ return RENDER_CLASS_TYPE.ENGINE;
+ }
+
+ get activeScene() {
+ return this._activeScene;
+ }
+
+ getScenes() {
+ return this._scenes;
+ }
+
+ getScene(sceneKey: string): Scene | null {
+ return this._scenes[sceneKey];
+ }
+
+ hasScene(sceneKey: string): boolean {
+ return sceneKey in this._scenes;
+ }
+
+ addScene(sceneInstance: Scene): Scene {
+ const sceneKey = (sceneInstance as any).sceneKey;
+ if (this.hasScene(sceneKey)) {
+ console.warn('Scenes has same key, it will be covered');
+ }
+ this._scenes[sceneKey] = sceneInstance;
+ return sceneInstance;
+ }
+
+ setActiveScene(sceneKey: string): Scene | null {
+ const scene = this.getScene(sceneKey);
+ if (scene) {
+ this._activeScene = scene;
+ }
+ return scene;
+ }
+
+ hasActiveScene(): boolean {
+ return this._activeScene != null;
+ }
+
get requestNewFrameHandler() {
return this._requestNewFrameHandler;
}
@@ -180,20 +226,20 @@ export class Engine extends ThinEngine<Scene> {
return this._frameId;
}
- override setCanvasCursor(val: CURSOR_TYPE) {
+ setCanvasCursor(val: CURSOR_TYPE) {
const canvasEl = this.getCanvas().getCanvasEle();
canvasEl.style.cursor = val;
}
- override clearCanvas() {
+ clearCanvas() {
this.getCanvas().clear();
}
- override getCanvas() {
+ getCanvas() {
return this._canvas!;
}
- override getCanvasElement() {
+ getCanvasElement() {
return this.getCanvas().getCanvasEle()!;
}
@@ -201,7 +247,7 @@ export class Engine extends ThinEngine<Scene> {
* To ensure mouse events remain bound to the host element,
* preventing the events from becoming ineffective once the mouse leaves the host.
*/
- override setRemainCapture() {
+ setRemainCapture() {
try {
this.getCanvasElement().setPointerCapture(this._remainCapture);
} catch {
@@ -288,6 +334,13 @@ export class Engine extends ThinEngine<Scene> {
override dispose() {
super.dispose();
+ const scenes = { ...this.getScenes() };
+ const sceneKeys = Object.keys(scenes);
+ sceneKeys.forEach((key) => {
+ (scenes[key] as any).dispose();
+ });
+ this._scenes = {};
+
const eventPrefix = getPointerPrefix();
const canvasEle = this.getCanvasElement();
canvasEle.removeEventListener(`${eventPrefix}leave`, this._pointerLeaveEvent);
diff --git a/packages/engine-render/src/group.ts b/packages/engine-render/src/group.ts
index 6c1a4d2f57..a6d4c8dfbc 100644
--- a/packages/engine-render/src/group.ts
+++ b/packages/engine-render/src/group.ts
@@ -15,16 +15,15 @@
*/
import type { Nullable } from '@univerjs/core';
-import { sortRules } from '@univerjs/core';
+import type { CURSOR_TYPE } from './basics/const';
+import type { IViewportInfo } from './basics/vector2';
+import type { UniverRenderingContext } from './context';
+import { sortRules } from '@univerjs/core';
import { BaseObject } from './base-object';
-import type { CURSOR_TYPE } from './basics/const';
import { RENDER_CLASS_TYPE } from './basics/const';
-import { isString } from './basics/tools';
-import type { IViewportInfo, Vector2 } from './basics/vector2';
-import type { UniverRenderingContext } from './context';
-import type { ThinScene } from './thin-scene';
import { getGroupState, transformObjectOutOfGroup } from './basics/group-transform';
+import { isString } from './basics/tools';
export class Group extends BaseObject {
private _objects: BaseObject[] = [];
@@ -148,7 +147,7 @@ export class Group extends BaseObject {
addObject(o: BaseObject | string) {
let object: Nullable<BaseObject | string> = o;
if (isString(o)) {
- const scene = this.getScene() as ThinScene;
+ const scene = this.getScene();
object = scene?.getObject(o);
if (!object) {
// console.info('No object be added');
@@ -260,26 +259,25 @@ export class Group extends BaseObject {
ctx.restore();
}
- override resize(width?: number | string, height?: number | string) {
- return this;
- }
+ // override resize(width?: number | string, height?: number | string) {
+ // return this;
+ // }
- override scale(scaleX?: number, scaleY?: number) {
- return this;
- }
+ // override scale(scaleX?: number, scaleY?: number) {
+ // return this;
+ // }
- override skew(skewX?: number, skewY?: number) {
- return this;
- }
+ // override skew(skewX?: number, skewY?: number) {
+ // return this;
+ // }
- override flip(flipX?: boolean, flipY?: boolean) {
- return this;
- }
+ // override flip(flipX?: boolean, flipY?: boolean) {
+ // return this;
+ // }
- // 判断自己scope下的所有对象是否有被选中的
- override isHit(coord: Vector2) {
- return true;
- }
+ // override isHit(coord: Vector2) {
+ // return true;
+ // }
private _clear() {
this._objects = [];
@@ -293,8 +291,4 @@ export class Group extends BaseObject {
this._clear();
super.dispose();
}
-
- private _transformBounds(bounds?: IViewportInfo) {
- return bounds;
- }
}
diff --git a/packages/engine-render/src/scene-viewer.ts b/packages/engine-render/src/scene-viewer.ts
index 3cea8c5046..af7b1875b1 100644
--- a/packages/engine-render/src/scene-viewer.ts
+++ b/packages/engine-render/src/scene-viewer.ts
@@ -16,17 +16,17 @@
import type { IKeyValue, Nullable } from '@univerjs/core';
-import { BaseObject } from './base-object';
-import { RENDER_CLASS_TYPE } from './basics/const';
import type { IObjectFullState } from './basics/interfaces';
import type { IViewportInfo, Vector2 } from './basics/vector2';
import type { UniverRenderingContext } from './context';
-import type { ThinScene } from './thin-scene';
+import type { Scene } from './scene';
+import { BaseObject } from './base-object';
+import { RENDER_CLASS_TYPE } from './basics/const';
export class SceneViewer extends BaseObject {
- private _subScenes = new Map<string, ThinScene>();
+ private _subScenes = new Map<string, Scene>();
- private _activeSubScene: Nullable<ThinScene>;
+ private _activeSubScene: Nullable<Scene>;
private _allowSelectedClipElement = false;
@@ -86,7 +86,7 @@ export class SceneViewer extends BaseObject {
}
}
- addSubScene(scene: ThinScene) {
+ addSubScene(scene: Scene) {
this._activeSubScene = scene;
this._subScenes.set(scene.sceneKey, scene);
this.makeDirty();
diff --git a/packages/engine-render/src/scene.input-manager.ts b/packages/engine-render/src/scene.input-manager.ts
index 1b5f1e5e17..ead273b967 100644
--- a/packages/engine-render/src/scene.input-manager.ts
+++ b/packages/engine-render/src/scene.input-manager.ts
@@ -20,7 +20,6 @@ import type { Subscription } from 'rxjs';
import type { BaseObject } from './base-object';
import type { IDragEvent, IEvent, IKeyboardEvent, IMouseEvent, IPointerEvent, IWheelEvent } from './basics/i-events';
import type { ISceneInputControlOptions, Scene } from './scene';
-import type { ThinScene } from './thin-scene';
import { Disposable, type Nullable, toDisposable } from '@univerjs/core';
import { RENDER_CLASS_TYPE } from './basics/const';
import { DeviceType, PointerInput } from './basics/i-events';
@@ -41,45 +40,23 @@ export class InputManager extends Disposable {
/** If you need to check double click without raising a single click at first click, enable this flag */
static ExclusiveDoubleClickMode = false;
- private _scene!: ThinScene;
+ private _scene!: 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 = false;
- // private _alreadyAttachedTo: HTMLElement;
-
// WorkBookObserver
private _onInput$: Nullable<Subscription>;
- // Pointers
- // private _onPointerMove!: (evt: IMouseEvent) => void;
- // private _onPointerDown!: (evt: IPointerEvent) => void;
- // private _onPointerUp!: (evt: IPointerEvent) => void;
- // private _onPointerOut!: (evt: IPointerEvent) => void;
- // private _onPointerCancel!: (evt: IPointerEvent) => void;
- // private _onPointerEnter!: (evt: IPointerEvent) => void;
- // private _onPointerLeave!: (evt: IPointerEvent) => void;
- // private _onMouseWheel!: (evt: IWheelEvent) => void;
-
- // Keyboard
- // private _onKeyDown!: (evt: IKeyboardEvent) => void;
- // private _onKeyUp!: (evt: IKeyboardEvent) => void;
-
- // Drag
- // private _onDragEnter!: (evt: IDragEvent) => void;
- // private _onDragLeave!: (evt: IDragEvent) => void;
- // private _onDragOver!: (evt: IDragEvent) => void;
- // private _onDrop!: (evt: IDragEvent) => void;
-
- private _currentMouseEnterPicked: Nullable<BaseObject | ThinScene>;
+ private _currentMouseEnterPicked: Nullable<BaseObject | Scene>;
private _startingPosition = new Vector2(Number.POSITIVE_INFINITY, Number.POSITIVE_INFINITY);
private _delayedTimeout: NodeJS.Timeout | number = -1;
private _delayedTripeTimeout: NodeJS.Timeout | number = -1;
private _doubleClickOccurred = 0;
private _tripleClickState = false;
- private _currentObject: Nullable<BaseObject | ThinScene>;
+ private _currentObject: Nullable<BaseObject | Scene>;
- constructor(scene: ThinScene) {
+ constructor(scene: Scene) {
super();
this._scene = scene;
}
@@ -90,14 +67,13 @@ export class InputManager extends Disposable {
override dispose(): void {
super.dispose();
this.detachControl();
- this._scene = null as unknown as ThinScene;
- // this._currentMouseEnterPicked?.dispose();
+ this._scene = null as unknown as Scene;
this._currentMouseEnterPicked = null;
- // this._currentObject?.dispose();
this._currentObject = null;
this._startingPosition = null as unknown as Vector2;
clearTimeout(this._delayedTimeout);
clearTimeout(this._delayedTripeTimeout);
+
this._onPointerMove = null as unknown as (evt: IMouseEvent) => void;
this._onPointerDown = null as unknown as (evt: IPointerEvent) => void;
this._onPointerUp = null as unknown as (evt: IPointerEvent) => void;
@@ -147,15 +123,7 @@ export class InputManager extends Disposable {
}
this._currentObject = this._getObjectAtPos(evt.offsetX, evt.offsetY);
- const _isStop = this._currentObject?.triggerPointerMove(evt);
-
this.mouseLeaveEnterHandler(evt);
-
- // if (this._checkDirectSceneEventTrigger(!isStop, this._currentObject)) {
- // if (this._scene.onPointerMoveObserver.hasObservers()) {
- // this._scene.onPointerMoveObserver.notifyObservers(evt);
- // }
- // }
}
_onPointerLeave(evt: IPointerEvent) {
@@ -164,18 +132,8 @@ export class InputManager extends Disposable {
evt.pointerId = 0;
}
- // this._currentObject = this._getCurrentObject(evt.offsetX, evt.offsetY);
- // const isStop = this._currentObject?.triggerPointerMove(evt);
-
this._currentObject = null;
-
this.mouseLeaveEnterHandler(evt);
-
- // if (this._checkDirectSceneEventTrigger(!isStop, this._currentObject)) {
- // if (this._scene.onPointerMoveObserver.hasObservers()) {
- // this._scene.onPointerMoveObserver.notifyObservers(evt);
- // }
- // }
}
_onPointerMove(evt: IMouseEvent) {
@@ -403,21 +361,19 @@ export class InputManager extends Disposable {
}
// engine.onInputChanged$.remove(this._onInput$);
this._onInput$?.unsubscribe();
-
this._alreadyAttached = false;
}
/**
- * Just call this._scene?.pick, nothing special.
+ * Just call this._scene.pick, nothing special.
* @param offsetX
* @param offsetY
- * @returns
*/
private _getObjectAtPos(offsetX: number, offsetY: number) {
return this._scene?.pick(Vector2.FromArray([offsetX, offsetY]));
}
- private _checkDirectSceneEventTrigger(isTrigger: boolean, currentObject: Nullable<ThinScene | BaseObject>) {
+ private _checkDirectSceneEventTrigger(isTrigger: boolean, currentObject: Nullable<Scene | BaseObject>) {
let notObject = false;
if (currentObject == null) {
notObject = true;
@@ -425,7 +381,7 @@ export class InputManager extends Disposable {
let isNotInSceneViewer = true;
if (currentObject && currentObject.classType === RENDER_CLASS_TYPE.BASE_OBJECT) {
- const scene = (currentObject as BaseObject).getScene() as ThinScene;
+ const scene = (currentObject as BaseObject).getScene() as Scene;
if (scene) {
const parent = scene.getParent();
isNotInSceneViewer = parent.classType !== RENDER_CLASS_TYPE.SCENE_VIEWER;
diff --git a/packages/engine-render/src/scene.ts b/packages/engine-render/src/scene.ts
index 2cfabd0948..209905e001 100644
--- a/packages/engine-render/src/scene.ts
+++ b/packages/engine-render/src/scene.ts
@@ -24,9 +24,8 @@ import type { Canvas } from './canvas';
import type { UniverRenderingContext } from './context';
import type { Engine } from './engine';
import type { SceneViewer } from './scene-viewer';
-import type { ThinEngine } from './thin-engine';
import type { Viewport } from './viewport';
-import { sortRules, sortRulesByDesc, toDisposable } from '@univerjs/core';
+import { Disposable, EventSubject, sortRules, sortRulesByDesc, toDisposable } from '@univerjs/core';
import { BehaviorSubject } from 'rxjs';
import { CURSOR_TYPE, RENDER_CLASS_TYPE } from './basics/const';
import { TRANSFORM_CHANGE_OBSERVABLE_TYPE } from './basics/interfaces';
@@ -35,7 +34,6 @@ import { Transform } from './basics/transform';
import { Layer } from './layer';
import { InputManager } from './scene.input-manager';
import { Transformer } from './scene.transformer';
-import { ThinScene } from './thin-scene';
export const MAIN_VIEW_PORT_KEY = 'viewMain';
@@ -47,26 +45,48 @@ export interface ISceneInputControlOptions {
enableEnter: boolean ;
enableLeave: boolean ;
}
-export class Scene extends ThinScene {
- private _layers: Layer[] = [];
+export class Scene extends Disposable {
+ private _sceneKey: string = '';
+ private _width: number = 100;
+ private _height: number = 100;
+ private _scaleX: number = 1;
+ private _scaleY: number = 1;
+ private _transform = new Transform();
+ private _evented = true;
+ private _layers: Layer[] = [];
private _viewports: Viewport[] = [];
private _cursor: CURSOR_TYPE = CURSOR_TYPE.DEFAULT;
-
private _defaultCursor: CURSOR_TYPE = CURSOR_TYPE.DEFAULT;
private _addObject$ = new BehaviorSubject<Scene>(this);
-
readonly addObject$ = this._addObject$.asObservable();
- private _beforeRender$ = new BehaviorSubject<Nullable<Canvas>>(null);
+ onTransformChange$ = new EventSubject<ITransformChangeState>();
+ onFileLoaded$ = new EventSubject<string>();
+ onPointerDown$ = new EventSubject<IPointerEvent | IMouseEvent>();
+ onPointerMove$ = new EventSubject<IPointerEvent | IMouseEvent>();
+ onPointerUp$ = new EventSubject<IPointerEvent | IMouseEvent>();
+ onPointerEnter$ = new EventSubject<IPointerEvent | IMouseEvent>();
+ onPointerOut$ = new EventSubject<IPointerEvent | IMouseEvent>();
+ onPointerCancel$ = new EventSubject<IPointerEvent | IMouseEvent>();
+ onPointerLeave$ = new EventSubject<IPointerEvent | IMouseEvent>();
+ onDragEnter$ = new EventSubject<IDragEvent>();
+ onDragOver$ = new EventSubject<IDragEvent>();
+ onDragLeave$ = new EventSubject<IDragEvent>();
+ onDrop$ = new EventSubject<IDragEvent>();
+ onDblclick$ = new EventSubject<IPointerEvent | IMouseEvent>();
+ onTripleClick$ = new EventSubject<IPointerEvent | IMouseEvent>();
+ onMouseWheel$ = new EventSubject<IWheelEvent>();
+ onKeyDown$ = new EventSubject<IKeyboardEvent>();
+ onKeyUp$ = new EventSubject<IKeyboardEvent>();
+ private _beforeRender$ = new BehaviorSubject<Nullable<Canvas>>(null);
readonly beforeRender$ = this._beforeRender$.asObservable();
-
private _afterRender$ = new BehaviorSubject<Nullable<Canvas>>(null);
-
readonly afterRender$ = this._afterRender$.asObservable();
+
/**
* Transformer constructor. Transformer is a special type of group that allow you transform
* primitives and shapes. Transforming tool is not changing `width` and `height` properties of nodes
@@ -79,23 +99,23 @@ export class Scene extends ThinScene {
constructor(
sceneKey: string,
- private _parent: ThinEngine<Scene> | SceneViewer,
+ private _parent: Engine | SceneViewer,
state?: ISceneTransformState
) {
- super(sceneKey);
+ super();
+ this._sceneKey = sceneKey;
if (state) {
this.transformByState(state);
}
if (this._parent.classType === RENDER_CLASS_TYPE.ENGINE) {
- const parent = this._parent as ThinEngine<Scene>;
+ const parent = this._parent as Engine;
parent.addScene(this);
if (!parent.hasActiveScene()) {
parent.setActiveScene(sceneKey);
}
this._inputManager = new InputManager(this);
} else if (this._parent.classType === RENDER_CLASS_TYPE.SCENE_VIEWER) {
- // 挂载到 sceneViewer 的 scene 需要响应前者的 transform
const parent = this._parent as SceneViewer;
parent.addSubScene(this);
}
@@ -109,6 +129,58 @@ export class Scene extends ThinScene {
);
}
+ get classType() {
+ return RENDER_CLASS_TYPE.SCENE;
+ }
+
+ get transform() {
+ return this._transform;
+ }
+
+ get width() {
+ return this._width;
+ }
+
+ get height() {
+ return this._height;
+ }
+
+ get scaleX() {
+ return this._scaleX;
+ }
+
+ get scaleY() {
+ return this._scaleY;
+ }
+
+ get sceneKey() {
+ return this._sceneKey;
+ }
+
+ get objectsEvented() {
+ return this._evented;
+ }
+
+ set transform(trans: Transform) {
+ this._transform = trans;
+ }
+
+ set width(num: number) {
+ this._width = num;
+ }
+
+ set height(num: number) {
+ this._height = num;
+ }
+
+ set scaleX(scaleX: number) {
+ this._scaleX = scaleX;
+ }
+
+ set scaleY(scaleY: number) {
+ this._scaleY = scaleY;
+ }
+
get ancestorScaleX() {
const p = this.getParent();
let pScale = 1;
@@ -165,7 +237,7 @@ export class Scene extends ThinScene {
return this;
}
- override makeDirty(state: boolean = true) {
+ makeDirty(state: boolean = true) {
this._layers.forEach((layer) => {
layer.makeDirty(state);
});
@@ -175,7 +247,7 @@ export class Scene extends ThinScene {
return this;
}
- override makeDirtyNoParent(state: boolean = true) {
+ makeDirtyNoParent(state: boolean = true) {
this._layers.forEach((layer) => {
layer.makeDirty(state);
});
@@ -208,11 +280,11 @@ export class Scene extends ThinScene {
return this._cursor;
}
- override resetCursor() {
+ resetCursor() {
this.setCursor(this._defaultCursor);
}
- override setCursor(val: CURSOR_TYPE) {
+ setCursor(val: CURSOR_TYPE) {
this._cursor = val;
const engine = this.getEngine();
if (!engine) {
@@ -344,11 +416,11 @@ export class Scene extends ThinScene {
});
}
- override getParent(): ThinEngine<Scene> | SceneViewer {
+ getParent(): Engine | SceneViewer {
return this._parent;
}
- override getEngine(): Nullable<Engine> {
+ getEngine(): Nullable<Engine> {
if (this._parent.classType === RENDER_CLASS_TYPE.ENGINE) {
return this._parent as Engine;
}
@@ -406,7 +478,7 @@ export class Scene extends ThinScene {
* @param zIndex
* @returns {Scene} this
*/
- override addObjects(objects: BaseObject[], zIndex: number = 1): Scene {
+ addObjects(objects: BaseObject[], zIndex: number = 1): Scene {
this.getLayer(zIndex)?.addObjects(objects);
this._addObject$.next(this);
return this;
@@ -419,7 +491,7 @@ export class Scene extends ThinScene {
* @param zIndex layer index
* @returns {Scene} scene
*/
- override addObject(o: BaseObject, zIndex: number = 1): Scene {
+ addObject(o: BaseObject, zIndex: number = 1): Scene {
this.getLayer(zIndex)?.addObject(o);
this._addObject$.next(this);
return this;
@@ -430,7 +502,7 @@ export class Scene extends ThinScene {
* @param o
* @returns {void}
*/
- override setObjectBehavior(o: BaseObject): void {
+ setObjectBehavior(o: BaseObject): void {
if (!o.parent) {
o.parent = this;
}
@@ -544,7 +616,7 @@ export class Scene extends ThinScene {
return objects;
}
- override getObject(oKey: string): Nullable<BaseObject> {
+ getObject(oKey: string): Nullable<BaseObject> {
for (const layer of this._layers) {
const objects = layer.getObjectsByOrder();
for (const object of objects) {
@@ -580,12 +652,12 @@ export class Scene extends ThinScene {
return results;
}
- override addViewport(...viewport: Viewport[]) {
+ addViewport(...viewport: Viewport[]) {
this._viewports.push(...viewport);
return this;
}
- override removeViewport(key: string) {
+ removeViewport(key: string) {
for (let i = 0, len = this._viewports.length; i < len; i++) {
const viewport = this._viewports[i];
if (viewport.viewportKey === key) {
@@ -595,7 +667,7 @@ export class Scene extends ThinScene {
}
}
- override getViewports() {
+ getViewports() {
return this._viewports;
}
@@ -611,7 +683,7 @@ export class Scene extends ThinScene {
}
}
- override render(parentCtx?: UniverRenderingContext) {
+ render(parentCtx?: UniverRenderingContext) {
if (!this.isDirty()) {
return;
}
@@ -638,14 +710,14 @@ export class Scene extends ThinScene {
* create transformer if not exist, and then transformer attach to object that passed in by parameter.
* @param o
*/
- override attachTransformerTo(o: BaseObject) {
+ attachTransformerTo(o: BaseObject) {
if (!this._transformer) {
this.initTransformer();
}
this._transformer?.attachTo(o);
}
- override detachTransformerFrom(o: BaseObject) {
+ detachTransformerFrom(o: BaseObject) {
this._transformer?.detachFrom(o);
}
@@ -673,26 +745,18 @@ export class Scene extends ThinScene {
}
/**
- * prev getActiveViewportByRelativeCoord
+ * Get viewport by cursor position.
+ * Position is relative to canvas(event offsetXY).
* @param coord
* @returns
*/
- findViewportByPosToViewport(coord: Vector2) {
+ findViewportByPosToScene(coord: Vector2) {
return this._viewports.find((vp) => vp.isHit(coord));
}
getActiveViewportByCoord(coord: Vector2) {
- // let parent: any = this.getParent();
- // while (parent) {
- // if (parent.classType === RENDER_CLASS_TYPE.SCENE_VIEWER) {
- // const sv = parent as SceneViewer;
- // const transform = sv.transform.clone().invert();
- // coord = transform.applyPoint(coord);
- // }
- // parent = parent?.getParent && parent?.getParent();
- // }
coord = this.getCoordRelativeToViewport(coord);
- return this.findViewportByPosToViewport(coord);
+ return this.findViewportByPosToScene(coord);
}
/**
@@ -712,7 +776,7 @@ export class Scene extends ThinScene {
*/
getScrollXYInfoByViewport(pos: Vector2, viewPort?: Viewport) {
if (!viewPort) {
- viewPort = this.findViewportByPosToViewport(pos) || this.getDefaultViewport();
+ viewPort = this.findViewportByPosToScene(pos) || this.getDefaultViewport();
}
return this.getViewportScrollXY(viewPort);
}
@@ -799,7 +863,7 @@ export class Scene extends ThinScene {
this._viewports = [];
}
- override getAncestorScale() {
+ getAncestorScale() {
let { scaleX = 1, scaleY = 1 } = this;
if (this.classType === RENDER_CLASS_TYPE.SCENE_VIEWER) {
@@ -813,7 +877,7 @@ export class Scene extends ThinScene {
};
}
- override getPrecisionScale() {
+ getPrecisionScale() {
const pixelRatio = this.getEngine()?.getPixelRatio() || 1;
const { scaleX, scaleY } = this.getAncestorScale();
@@ -844,26 +908,38 @@ export class Scene extends ThinScene {
this._inputManager = null;
this._transformer?.dispose();
this._transformer = null;
+
+ this.onFileLoaded$.complete();
+
this.onPointerDown$.complete();
this.onPointerMove$.complete();
this.onPointerUp$.complete();
this.onPointerEnter$.complete();
this.onPointerLeave$.complete();
+ this.onPointerOut$.complete();
+ this.onPointerCancel$.complete();
+
+ this.onDragEnter$.complete();
+ this.onDragOver$.complete();
+ this.onDragLeave$.complete();
+ this.onDrop$.complete();
+
this.onDblclick$.complete();
this.onTripleClick$.complete();
this.onMouseWheel$.complete();
this.onKeyDown$.complete();
this.onKeyUp$.complete();
this._addObject$.complete();
+
super.dispose();
}
/**
* 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
+ * @return {Nullable<BaseObject | Scene>} object under the pointer
*/
- override pick(coord: Vector2): Nullable<BaseObject | Scene | ThinScene> {
+ pick(coord: Vector2): Nullable<BaseObject | Scene> {
let pickedViewport = this.getActiveViewportByCoord(coord);
if (!pickedViewport) {
@@ -881,7 +957,7 @@ export class Scene extends ThinScene {
const vecFromSheetContent = pickedViewport.transformVector2SceneCoord(coord);
- let isPickedObject: Nullable<BaseObject | Scene | ThinScene> = null;
+ let isPickedObject: Nullable<BaseObject | Scene> = null;
const objectOrder = this.getAllObjectsByOrderForPick().reverse();
const objectLength = objectOrder.length;
@@ -928,21 +1004,21 @@ export class Scene extends ThinScene {
return isPickedObject;
}
- override triggerKeyDown(evt: IKeyboardEvent) {
+ triggerKeyDown(evt: IKeyboardEvent) {
this.onKeyDown$.emitEvent(evt);
// if (this._parent instanceof SceneViewer) {
// this._parent?.triggerKeyDown(evt);
// }
}
- override triggerKeyUp(evt: IKeyboardEvent) {
+ triggerKeyUp(evt: IKeyboardEvent) {
this.onKeyUp$.emitEvent(evt);
// if (this._parent instanceof SceneViewer) {
// this._parent?.triggerKeyUp(evt);
// }
}
- override triggerPointerUp(evt: IPointerEvent | IMouseEvent) {
+ triggerPointerUp(evt: IPointerEvent | IMouseEvent) {
if (
!this.onPointerUp$.emitEvent(evt)?.stopPropagation &&
this._parent.classType === RENDER_CLASS_TYPE.SCENE_VIEWER
@@ -953,7 +1029,7 @@ export class Scene extends ThinScene {
return true;
}
- override triggerMouseWheel(evt: IWheelEvent) {
+ triggerMouseWheel(evt: IWheelEvent) {
if (
!this.onMouseWheel$.emitEvent(evt)?.stopPropagation &&
this._parent.classType === RENDER_CLASS_TYPE.SCENE_VIEWER
@@ -964,7 +1040,7 @@ export class Scene extends ThinScene {
return true;
}
- override triggerPointerMove(evt: IPointerEvent | IMouseEvent) {
+ triggerPointerMove(evt: IPointerEvent | IMouseEvent) {
if (
!this.onPointerMove$.emitEvent(evt)?.stopPropagation &&
this._parent.classType === RENDER_CLASS_TYPE.SCENE_VIEWER
@@ -975,7 +1051,7 @@ export class Scene extends ThinScene {
return true;
}
- override triggerDblclick(evt: IPointerEvent | IMouseEvent) {
+ triggerDblclick(evt: IPointerEvent | IMouseEvent) {
if (
!this.onDblclick$.emitEvent(evt)?.stopPropagation &&
this._parent.classType === RENDER_CLASS_TYPE.SCENE_VIEWER
@@ -986,7 +1062,7 @@ export class Scene extends ThinScene {
return true;
}
- override triggerTripleClick(evt: IPointerEvent | IMouseEvent) {
+ triggerTripleClick(evt: IPointerEvent | IMouseEvent) {
if (
!this.onTripleClick$.emitEvent(evt)?.stopPropagation &&
this._parent.classType === RENDER_CLASS_TYPE.SCENE_VIEWER
@@ -997,7 +1073,7 @@ export class Scene extends ThinScene {
return true;
}
- override triggerPointerDown(evt: IPointerEvent | IMouseEvent) {
+ triggerPointerDown(evt: IPointerEvent | IMouseEvent) {
if (
!this.onPointerDown$.emitEvent(evt)?.stopPropagation &&
this._parent.classType === RENDER_CLASS_TYPE.SCENE_VIEWER
@@ -1009,7 +1085,7 @@ export class Scene extends ThinScene {
return true;
}
- override triggerPointerOut(evt: IPointerEvent | IMouseEvent) {
+ triggerPointerOut(evt: IPointerEvent | IMouseEvent) {
// this.onPointerOutObserver.notifyObservers(evt);
if (this._parent.classType === RENDER_CLASS_TYPE.SCENE_VIEWER) {
(this._parent as SceneViewer)?.triggerPointerOut(evt);
@@ -1018,7 +1094,7 @@ export class Scene extends ThinScene {
return true;
}
- override triggerPointerLeave(evt: IPointerEvent | IMouseEvent) {
+ triggerPointerLeave(evt: IPointerEvent | IMouseEvent) {
// this.onPointerLeave$.emitEvent(evt);
if (
!this.onPointerLeave$.emitEvent(evt)?.stopPropagation &&
@@ -1030,7 +1106,7 @@ export class Scene extends ThinScene {
return true;
}
- override triggerPointerOver(evt: IPointerEvent | IMouseEvent) {
+ triggerPointerOver(evt: IPointerEvent | IMouseEvent) {
// this.onPointerOverObserver.notifyObservers(evt);
if (this._parent.classType === RENDER_CLASS_TYPE.SCENE_VIEWER) {
(this._parent as SceneViewer)?.triggerPointerOver(evt);
@@ -1039,7 +1115,7 @@ export class Scene extends ThinScene {
return true;
}
- override triggerPointerEnter(evt: IPointerEvent | IMouseEvent) {
+ triggerPointerEnter(evt: IPointerEvent | IMouseEvent) {
// this.onPointerEnter$.emitEvent(evt);
if (
!this.onPointerEnter$.emitEvent(evt)?.stopPropagation &&
@@ -1051,7 +1127,7 @@ export class Scene extends ThinScene {
return true;
}
- override triggerDragLeave(evt: IDragEvent) {
+ triggerDragLeave(evt: IDragEvent) {
if (
!this.onDragLeave$.emitEvent(evt)?.stopPropagation &&
this._parent.classType === RENDER_CLASS_TYPE.SCENE_VIEWER
@@ -1062,7 +1138,7 @@ export class Scene extends ThinScene {
return true;
}
- override triggerDragOver(evt: IDragEvent) {
+ triggerDragOver(evt: IDragEvent) {
if (
!this.onDragOver$.emitEvent(evt)?.stopPropagation &&
this._parent.classType === RENDER_CLASS_TYPE.SCENE_VIEWER
@@ -1073,7 +1149,7 @@ export class Scene extends ThinScene {
return true;
}
- override triggerDragEnter(evt: IDragEvent) {
+ triggerDragEnter(evt: IDragEvent) {
if (
!this.onDragEnter$.emitEvent(evt)?.stopPropagation &&
this._parent.classType === RENDER_CLASS_TYPE.SCENE_VIEWER
@@ -1084,7 +1160,7 @@ export class Scene extends ThinScene {
return true;
}
- override triggerDrop(evt: IDragEvent) {
+ triggerDrop(evt: IDragEvent) {
if (
!this.onDrop$.emitEvent(evt)?.stopPropagation &&
this._parent.classType === RENDER_CLASS_TYPE.SCENE_VIEWER
@@ -1114,17 +1190,16 @@ export class Scene extends ThinScene {
this.makeDirty(true);
}
- private _getGroupCumLeftRight(object: BaseObject) {
- let parent: any = object.parent;
- let cumLeft = 0;
- let cumTop = 0;
- while (parent.classType === RENDER_CLASS_TYPE.GROUP) {
- const { left, top } = parent;
- cumLeft += left;
- cumTop += top;
+ /**
+ * If scene.event is disabled, scene.pick(cursor Pos) return null.
+ * Then only scene itself can response to pointer event, all objects under the scene would not.
+ * see sceneInputManager@_onPointerMove
+ */
+ disableObjectsEvent() {
+ this._evented = false;
+ }
- parent = parent.parent;
- }
- return { cumLeft, cumTop };
+ enableObjectsEvent() {
+ this._evented = true;
}
}
diff --git a/packages/engine-render/src/scroll-timer.ts b/packages/engine-render/src/scroll-timer.ts
index 04641c67e6..8e6a30efc7 100644
--- a/packages/engine-render/src/scroll-timer.ts
+++ b/packages/engine-render/src/scroll-timer.ts
@@ -16,12 +16,10 @@
import type { IPaddingData, Nullable } from '@univerjs/core';
-import { RENDER_CLASS_TYPE } from './basics/const';
-import { cancelRequestFrame, requestNewFrame } from './basics/tools';
-import { Vector2 } from './basics/vector2';
import type { Scene } from './scene';
-import type { ThinScene } from './thin-scene';
import type { Viewport } from './viewport';
+import { cancelRequestFrame, requestNewFrame } from './basics/tools';
+import { Vector2 } from './basics/vector2';
export enum ScrollTimerType {
NONE,
@@ -30,6 +28,8 @@ export enum ScrollTimerType {
ALL,
}
+const THRESHOLD_TO_AUTO_MOVE: IPaddingData = { t: 0, b: 15, l: 0, r: 60 };
+
export class ScrollTimer {
private _requestNewFrameNumber: number = -1;
private _viewport: Nullable<any>;
@@ -40,23 +40,19 @@ export class ScrollTimer {
private _scrollX: number = 0;
private _scrollY: number = 0;
/**
- * Custmize scroll function.
+ * Customize scroll function.
*/
private _scrollFunction: Nullable<(x?: number, y?: number) => void>;
constructor(
private _scene: Scene,
private _scrollTimerType: ScrollTimerType = ScrollTimerType.ALL,
- private _padding?: IPaddingData
- // private _smoothRatioX = 0.4,
- // private _smoothRatioY = 0.05
+ private _thresholdAutoMove: IPaddingData = THRESHOLD_TO_AUTO_MOVE
) {
- if (!this._padding) {
- this._padding = { t: 0, b: 15, l: 0, r: 60 };
- }
+ //
}
- static create(scene: any, scrollTimerType: ScrollTimerType = ScrollTimerType.ALL, padding?: IPaddingData) {
+ static create(scene: Scene, scrollTimerType: ScrollTimerType = ScrollTimerType.ALL, padding?: IPaddingData) {
return new ScrollTimer(scene, scrollTimerType, padding);
}
@@ -86,7 +82,7 @@ export class ScrollTimer {
if (targetViewport != null) {
this._viewport = targetViewport;
} else {
- this._viewport = this.getViewportByCoord(this._scene);
+ this._viewport = this._scene.findViewportByPosToScene(Vector2.FromArray([offsetX, offsetY]));
}
this._runRenderLoop();
@@ -99,7 +95,7 @@ export class ScrollTimer {
const leftBounding = viewport?.left || 0;
const rightBounding = leftBounding + (viewport?.width || 0);
- const { t = 0, b = 0, r = 0, l = 0 } = this._padding!;
+ const { t = 0, b = 0, r = 0, l = 0 } = this._thresholdAutoMove;
let x = 0;
let y = 0;
@@ -134,11 +130,7 @@ export class ScrollTimer {
return;
}
- // const limited = viewport?.scrollBy({
- // x,
- // y,
- // });
- const limited = viewport?.scrollByViewportDeltaVal({
+ const scrolled = viewport?.scrollByViewportDeltaVal({
viewportScrollX: x,
viewportScrollY: y,
});
@@ -147,14 +139,6 @@ export class ScrollTimer {
this._scrollX = viewportScrollVal?.x || 0;
this._scrollY = viewportScrollVal?.y || 0;
-
- if (limited) {
- const ancestorScene = this._findAncestorScene(viewport?.scene);
- const newViewport = this.getViewportByCoord(ancestorScene);
- if (newViewport) {
- this._autoScroll(newViewport);
- }
- }
}
scrolling(offsetX: number, offsetY: number, scrollFunction: (x?: number, y?: number) => void) {
@@ -172,10 +156,6 @@ export class ScrollTimer {
delete this._scrollFunction;
}
- getViewportByCoord(scene?: Scene) {
- return scene?.findViewportByPosToViewport(Vector2.FromArray([this._offsetX, this._offsetY]));
- }
-
getScene() {
return this._scene;
}
@@ -187,14 +167,4 @@ export class ScrollTimer {
}
this._requestNewFrameNumber = requestNewFrame(this._runRenderLoop.bind(this));
}
-
- private _findAncestorScene(scene?: ThinScene) {
- let parent = scene?.getParent();
- while (parent) {
- if (parent.classType === RENDER_CLASS_TYPE.SCENE) {
- return parent;
- }
- parent = parent?.getParent && parent?.getParent();
- }
- }
}
diff --git a/packages/engine-render/src/shape/base-scroll-bar.ts b/packages/engine-render/src/shape/base-scroll-bar.ts
index ef78b4f5d0..284dcf19f4 100644
--- a/packages/engine-render/src/shape/base-scroll-bar.ts
+++ b/packages/engine-render/src/shape/base-scroll-bar.ts
@@ -14,12 +14,12 @@
* limitations under the License.
*/
-import { Disposable, type Nullable } from '@univerjs/core';
-
import type { Vector2 } from '../basics/vector2';
+
import type { UniverRenderingContext } from '../context';
-import type { ThinScene } from '../thin-scene';
+import type { Scene } from '../scene';
import type { Rect } from './rect';
+import { Disposable, type Nullable } from '@univerjs/core';
export interface IScrollBarProps {
thumbMargin?: number;
@@ -35,7 +35,7 @@ export interface IScrollBarProps {
enableHorizontal?: boolean;
enableVertical?: boolean;
- mainScene?: ThinScene;
+ mainScene?: Scene;
}
export abstract class BaseScrollBar extends Disposable {
diff --git a/packages/engine-render/src/shape/scroll-bar.ts b/packages/engine-render/src/shape/scroll-bar.ts
index f8f74ff024..856175cff8 100644
--- a/packages/engine-render/src/shape/scroll-bar.ts
+++ b/packages/engine-render/src/shape/scroll-bar.ts
@@ -14,25 +14,25 @@
* limitations under the License.
*/
-import { Subscription } from 'rxjs';
-
import type { EventState, IKeyValue, Nullable } from '@univerjs/core';
-import { Transform } from '../basics/transform';
-import { BaseScrollBar } from './base-scroll-bar';
-import { Rect } from './rect';
+
import type { IMouseEvent, IPointerEvent } from '../basics/i-events';
import type { Vector2 } from '../basics/vector2';
import type { UniverRenderingContext } from '../context';
-import type { ThinScene } from '../thin-scene';
+import type { Scene } from '../scene';
import type { Viewport } from '../viewport';
import type { IScrollBarProps } from './base-scroll-bar';
+import { Subscription } from 'rxjs';
+import { Transform } from '../basics/transform';
+import { BaseScrollBar } from './base-scroll-bar';
+import { Rect } from './rect';
const MINI_THUMB_SIZE = 17;
export class ScrollBar extends BaseScrollBar {
protected _viewport!: Viewport;
- private _mainScene: Nullable<ThinScene>;
+ private _mainScene: Nullable<Scene>;
private _lastX: number = -1;
diff --git a/packages/engine-render/src/thin-engine.ts b/packages/engine-render/src/thin-engine.ts
index fe6e0508a3..8c6fa68add 100644
--- a/packages/engine-render/src/thin-engine.ts
+++ b/packages/engine-render/src/thin-engine.ts
@@ -99,6 +99,7 @@ export abstract class ThinEngine<T extends IDisposable> extends Disposable {
getParent() {}
+ // TODO @lumixraku, it seems delete scene with key.
remainScene(key: string) {
const scenes = this.getScenes();
if (scenes[key]) {
diff --git a/packages/engine-render/src/thin-scene.ts b/packages/engine-render/src/thin-scene.ts
index bdc41b4015..b31066863c 100644
--- a/packages/engine-render/src/thin-scene.ts
+++ b/packages/engine-render/src/thin-scene.ts
@@ -22,8 +22,7 @@ import type { IDragEvent, IKeyboardEvent, IMouseEvent, IPointerEvent, IWheelEven
import type { ITransformChangeState } from './basics/interfaces';
import type { Vector2 } from './basics/vector2';
import type { UniverRenderingContext } from './context';
-import type { Scene } from './scene';
-import type { ThinEngine } from './thin-engine';
+import type { Engine } from './engine';
import { Disposable, EventSubject } from '@univerjs/core';
import { RENDER_CLASS_TYPE } from './basics/const';
import { Transform } from './basics/transform';
@@ -226,7 +225,7 @@ export abstract class ThinScene extends Disposable {
abstract addObjects(objects: BaseObject[], zIndex?: number): void;
- abstract getEngine(): Nullable<ThinEngine<Scene>>;
+ abstract getEngine(): Nullable<Engine>;
abstract setObjectBehavior(o: BaseObject): void;
diff --git a/packages/engine-render/src/viewport.ts b/packages/engine-render/src/viewport.ts
index 0fd9071712..4b5231c8a7 100644
--- a/packages/engine-render/src/viewport.ts
+++ b/packages/engine-render/src/viewport.ts
@@ -20,8 +20,8 @@ import type { BaseObject } from './base-object';
import type { IWheelEvent } from './basics/i-events';
import type { IBoundRectNoAngle, IViewportInfo } from './basics/vector2';
import type { UniverRenderingContext } from './context';
+import type { Scene } from './scene';
import type { BaseScrollBar } from './shape/base-scroll-bar';
-import type { ThinScene } from './thin-scene';
import { EventSubject, Tools } from '@univerjs/core';
import { RENDER_CLASS_TYPE } from './basics/const';
import { fixLineWidthByScale, toPx } from './basics/tools';
@@ -30,6 +30,13 @@ import { Vector2 } from './basics/vector2';
import { subtractViewportRange } from './basics/viewport-subtract';
import { Canvas as UniverCanvas } from './canvas';
+interface ILimitedScrollResult {
+ viewportScrollX: number;
+ viewportScrollY: number;
+ isLimitedX?: boolean;
+ isLimitedY?: boolean;
+}
+
interface IViewPosition {
top?: number;
left?: number;
@@ -165,7 +172,7 @@ export class Viewport {
private _height: Nullable<number>;
- private _scene!: ThinScene;
+ private _scene!: Scene;
private _scrollBar?: Nullable<BaseScrollBar>;
@@ -241,7 +248,7 @@ export class Viewport {
bufferEdgeX: number = 0;
bufferEdgeY: number = 0;
- constructor(viewportKey: string, scene: ThinScene, props?: IViewProps) {
+ constructor(viewportKey: string, scene: Scene, props?: IViewProps) {
this._viewportKey = viewportKey;
this._scene = scene;
this._scene.addViewport(this);
@@ -272,42 +279,6 @@ export class Viewport {
this.bufferEdgeX = props?.bufferEdgeX || 0;
this.bufferEdgeY = props?.bufferEdgeY || 0;
}
- // this._testDisplayCache();
- }
-
- /**
- * test
- */
- _testDisplayCache() {
- const globalThis = window as any;
- if (!globalThis.cacheSet) {
- globalThis.cacheSet = new Set();
- }
- const showCache = (cacheCanvas: UniverCanvas) => {
- cacheCanvas.getCanvasEle().classList.remove('univer-render-canvas');
- cacheCanvas.getCanvasEle().classList.add('viewport-cache-canvas');
- cacheCanvas.getCanvasEle().classList.add('cache-canvas', this.viewportKey);
- cacheCanvas.getCanvasEle().style.zIndex = '100';
- cacheCanvas.getCanvasEle().style.position = 'fixed';
- cacheCanvas.getCanvasEle().style.background = 'pink';
- cacheCanvas.getCanvasEle().style.pointerEvents = 'none';
- cacheCanvas.getCanvasEle().style.border = '1px solid black';
- cacheCanvas.getCanvasEle().style.transformOrigin = '100% 100%';
- cacheCanvas.getCanvasEle().style.transform = 'scale(0.5)';
- cacheCanvas.getCanvasEle().style.translate = '-20% 0%';
- cacheCanvas.getCanvasEle().style.opacity = '1';
- document.body.appendChild(cacheCanvas.getCanvasEle());
- };
- if (['viewMain', 'viewMainLeftTop', 'viewMainTop', 'viewMainLeft'].includes(this.viewportKey)) {
- if (this._cacheCanvas) {
- showCache(this._cacheCanvas);
- }
- }
- if (this.viewportKey === 'spreadInSlideViewMaintable1') {
- if (this._cacheCanvas) {
- showCache(this._cacheCanvas);
- }
- }
}
get scene() {
@@ -502,13 +473,6 @@ export class Viewport {
if (positionKeys.length === 0) {
return;
}
- // this._width = undefined;
- // this._height = undefined;
- // positionKeys.forEach((pKey) => {
- // if (position[pKey as keyof IViewPosition] !== undefined) {
- // (this as IKeyValue)[pKey] = position[pKey as keyof IViewPosition];
- // }
- // });
this._setViewportSize(position);
this.resetCanvasSizeAndUpdateScroll();
}
@@ -565,7 +529,7 @@ export class Viewport {
* Viewport scroll to certain position.
* @param pos
* @param isTrigger
- * @returns IViewportScrollPosition
+ * @returns {ILimitedScrollResult | null | undefined}
*/
scrollToViewportPos(pos: Partial<IViewportScrollPosition>, isTrigger = true) {
// TODO @lumixraku Now scrollManager only call viewportMain@scrollToViewportPos.
@@ -574,14 +538,20 @@ export class Viewport {
// so there should not return when inactive.
// it's not right, this method in other viewport should be called.
- // if (!this._scrollBar || this.isActive === false) {
- if (!this._scrollBar) {
+ if (!this._scrollBar || this.isActive === false) {
return;
}
const { viewportScrollX, viewportScrollY } = pos;
return this._scrollToViewportPosCore({ viewportScrollX, viewportScrollY }, isTrigger);
}
+ /**
+ * Scrolling by current position plus delta.
+ * if viewport can not scroll(e.g. viewport size is bigger than content size), then return null.
+ * @param delta
+ * @param isTrigger
+ * @returns {ILimitedScrollResult | null | undefined}
+ */
scrollByViewportDeltaVal(delta: IViewportScrollPosition, isTrigger = true) {
if (!this._scrollBar || this.isActive === false) {
return;
@@ -1011,9 +981,15 @@ export class Viewport {
this._scene.makeDirty(true);
}
+ /**
+ * Check if coord is in viewport.
+ * Coord is relative to canvas (scale is handled in isHit, Just pass in the original coord from event)
+ * @param coord
+ * @returns {boolean} is in viewport
+ */
isHit(coord: Vector2) {
if (this.isActive === false) {
- return;
+ return false;
}
const { width, height } = this._calcViewPortSize();
// const pixelRatio = this.getPixelRatio();
@@ -1107,9 +1083,8 @@ export class Viewport {
* Still in working progress, do not use it now.
* @param viewportScrollX
* @param viewportScrollY
- * @returns
*/
- _limitViewportScroll(viewportScrollX: number, viewportScrollY: number) {
+ _limitViewportScroll(viewportScrollX: number, viewportScrollY: number): ILimitedScrollResult {
const { width, height } = this._calcViewPortSize();
// Not enough! freeze row & col should also take into consideration.
const freezeHeight = this._paddingEndY - this._paddingStartY;
@@ -1323,11 +1298,10 @@ export class Viewport {
/**
* 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
*/
- private _scrollToViewportPosCore(scrollVpPos: Partial<IViewportScrollPosition>, isTrigger: boolean = true) {
+ private _scrollToViewportPosCore(scrollVpPos: Partial<IViewportScrollPosition>, isTrigger: boolean = true): Nullable<ILimitedScrollResult> {
if (this._scrollBar == null) {
return;
}
diff --git a/packages/sheets-ui/src/services/scroll-manager.service.ts b/packages/sheets-ui/src/services/scroll-manager.service.ts
index e1ed08fc55..4ca806a5fe 100644
--- a/packages/sheets-ui/src/services/scroll-manager.service.ts
+++ b/packages/sheets-ui/src/services/scroll-manager.service.ts
@@ -69,11 +69,11 @@ export class SheetScrollManagerService implements IRenderModule {
/**
* a subject for current sheet scrollInfo, no limit by viewport.
*/
- private readonly _rawscrollInfo$ = new BehaviorSubject<Nullable<IScrollState>>(null);
+ private readonly _rawScrollInfo$ = new BehaviorSubject<Nullable<IScrollState>>(null);
/**
* a subject for current sheet scrollInfo ( events, ex wheel event and point events add deltaXY to rawScrollInfo$)
*/
- readonly rawScrollInfo$ = this._rawscrollInfo$.asObservable();
+ readonly rawScrollInfo$ = this._rawScrollInfo$.asObservable();
/**
* a subject for current valid scrollInfo, viewport@_scrollCore would limit rawScrollInfo$ exclude negative value or over max value.
* use this subject not rawScrollInfo$ when get scrolling state of viewport.
@@ -96,7 +96,7 @@ export class SheetScrollManagerService implements IRenderModule {
}
dispose(): void {
- this._rawscrollInfo$.complete();
+ this._rawScrollInfo$.complete();
}
setSearchParam(param: IScrollStateSearchParam) {
@@ -228,6 +228,6 @@ export class SheetScrollManagerService implements IRenderModule {
const scrollInfo = this._getCurrentScroll(param);
// subscriber can be found in scrollManagerService.rawScrollInfo$.subscribe
- this._rawscrollInfo$.next(scrollInfo);
+ this._rawScrollInfo$.next(scrollInfo);
}
}
diff --git a/packages/sheets-ui/src/services/selection/selection-shape-extension.ts b/packages/sheets-ui/src/services/selection/selection-shape-extension.ts
index b4d7512c45..f5b1511939 100644
--- a/packages/sheets-ui/src/services/selection/selection-shape-extension.ts
+++ b/packages/sheets-ui/src/services/selection/selection-shape-extension.ts
@@ -473,9 +473,9 @@ export class SelectionShapeExtension {
} else if (cursor === CURSOR_TYPE.SOUTH_RESIZE) {
this._relativeSelectionPositionRow = startRow;
}
-
const scrollTimer = ScrollTimer.create(scene);
- scrollTimer.startScroll(newEvtOffsetX, newEvtOffsetY);
+ const viewMain = scene.getViewport(SHEET_VIEWPORT_KEY.VIEW_MAIN)!;
+ scrollTimer.startScroll(newEvtOffsetX, newEvtOffsetY, viewMain);
this._scrollTimer = scrollTimer;
scene.disableObjectsEvent();