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.
TypeScript boardcollaborationdocdocxexceloffce365officepdfpptpptxpresentationsdksheetslidesspreadsheetuniverwordwordprocessorworkspacexlsx
fix: add event click (#4862)
lumix2e78781a4568
diff --git a/packages/engine-render/src/base-object.ts b/packages/engine-render/src/base-object.tsindex 81181d66d4..9cdf00c43a 100644--- a/packages/engine-render/src/base-object.ts+++ b/packages/engine-render/src/base-object.ts@@ -71,6 +71,7 @@ export abstract class BaseObject extends Disposable {onPointerLeave$ = new EventSubject<IPointerEvent | IMouseEvent>();onPointerEnter$ = new EventSubject<IPointerEvent | IMouseEvent>();+ onClick$ = new EventSubject<IPointerEvent | IMouseEvent>();onDblclick$ = new EventSubject<IPointerEvent | IMouseEvent>();onTripleClick$ = new EventSubject<IPointerEvent | IMouseEvent>();onMouseWheel$ = new EventSubject<IWheelEvent>();@@ -648,13 +649,20 @@ export abstract class BaseObject extends Disposable {return true;}+ triggerClick(evt: IPointerEvent | IMouseEvent) {+ if (!this.onClick$.emitEvent(evt)?.stopPropagation) {+ this._parent?.triggerClick(evt);+ return false;+ }+ return true;+ }+triggerDblclick(evt: IPointerEvent | IMouseEvent) {if (!this.onDblclick$.emitEvent(evt)?.stopPropagation) {this._parent?.triggerDblclick(evt);return false;}-return true;}@@ -763,6 +771,7 @@ export abstract class BaseObject extends Disposable {this.onDragOver$.complete();this.onDragEnter$.complete();this.onDrop$.complete();+ this.onClick$.complete();this.onDblclick$.complete();this.onTripleClick$.complete();this.onIsAddedToParent$.complete();diff --git a/packages/engine-render/src/engine.ts b/packages/engine-render/src/engine.tsindex 01efc66d90..439c54313e 100644--- a/packages/engine-render/src/engine.ts+++ b/packages/engine-render/src/engine.ts@@ -108,6 +108,8 @@ export class Engine extends Disposable {private _performanceMonitor: PerformanceMonitor;+ private _pointerClickEvent!: (evt: Event) => void;+private _pointerMoveEvent!: (evt: Event) => void;private _pointerDownEvent!: (evt: Event) => void;@@ -421,6 +423,7 @@ export class Engine extends Disposable {const eventPrefix = getPointerPrefix();const canvasEle = this.getCanvasElement();+ canvasEle.removeEventListener('click', this._pointerClickEvent);canvasEle.removeEventListener(`${eventPrefix}leave`, this._pointerLeaveEvent);canvasEle.removeEventListener(`${eventPrefix}enter`, this._pointerEnterEvent);canvasEle.removeEventListener(`${eventPrefix}move`, this._pointerMoveEvent);@@ -622,6 +625,13 @@ export class Engine extends Disposable {private _handlePointerAction() {const eventPrefix = getPointerPrefix();+ this._pointerClickEvent = (e: Event) => {+ const deviceType = this._getPointerType(e);+ const deviceEvent = e as IPointerEvent;+ deviceEvent.deviceType = deviceType;+ this.onInputChanged$.emitEvent(deviceEvent);+ };+this._pointerMoveEvent = (e: Event) => {const evt = e as PointerEvent | MouseEvent;const deviceType = this._getPointerType(evt);@@ -866,6 +876,7 @@ export class Engine extends Disposable {};const canvasEle = this.getCanvasElement();+ canvasEle.addEventListener('click', this._pointerClickEvent);canvasEle.addEventListener(`${eventPrefix}enter`, this._pointerEnterEvent);canvasEle.addEventListener(`${eventPrefix}leave`, this._pointerLeaveEvent);canvasEle.addEventListener(`${eventPrefix}move`, this._pointerMoveEvent);diff --git a/packages/engine-render/src/scene.input-manager.ts b/packages/engine-render/src/scene.input-manager.tsindex 5099eec446..6bca45f676 100644--- a/packages/engine-render/src/scene.input-manager.ts+++ b/packages/engine-render/src/scene.input-manager.ts@@ -75,6 +75,8 @@ export class InputManager extends Disposable {clearTimeout(this._delayedTimeout);clearTimeout(this._delayedTripeTimeout);+ this._onClick = null as unknown as (evt: IMouseEvent) => void;+ this._onDblClick = null as unknown as (evt: IMouseEvent) => void;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;@@ -117,6 +119,32 @@ export class InputManager extends Disposable {}}+ _onClick(evt: IPointerEvent) {+ if (evt.pointerId === undefined) {+ (evt as unknown as PointerEvent).pointerId = 0;+ }++ const currentObject = this._getObjectAtPos(evt.offsetX, evt.offsetY);+ const isStop = currentObject?.triggerClick(evt);++ if (!isStop && this._shouldDispatchEventToScene(currentObject)) {+ this._scene.onPointerDown$.emitEvent(evt);+ }+ }++ _onDblClick(evt: IPointerEvent) {+ if (evt.pointerId === undefined) {+ (evt as unknown as PointerEvent).pointerId = 0;+ }++ const currentObject = this._getObjectAtPos(evt.offsetX, evt.offsetY);+ const isStop = currentObject?.triggerDblclick(evt);++ if (!isStop && this._shouldDispatchEventToScene(currentObject)) {+ this._scene.onPointerDown$.emitEvent(evt);+ }+ }+_onPointerEnter(evt: IPointerEvent) {// preserve compatibility with Safari when pointerId is not presentif (evt.pointerId === undefined) {@@ -210,12 +238,12 @@ export class InputManager extends Disposable {}_onKeyDown(evt: IKeyboardEvent) {- // currently nobody using this. use `fromGlobalEvent('keydown')` from rx.js instead.+ // currently nobody using this. use `fromEvent('keydown')` from rx.js instead.this._scene.onKeyDown$.emitEvent(evt);}_onKeyUp(evt: IKeyboardEvent) {- // currently nobody using this. use `fromGlobalEvent('keyup')` from rx.js instead.+ // currently nobody using this. use `fromEvent('keyup')` from rx.js instead.this._scene.onKeyUp$.emitEvent(evt);}@@ -288,6 +316,9 @@ export class InputManager extends Disposable {this._onMouseWheel(evt as IWheelEvent);}break;+ case 'click':+ this._onClick(evt as IPointerEvent);+ break;case 'pointerout':this._onPointerOut(evt as IPointerEvent);break;diff --git a/packages/engine-render/src/scene.ts b/packages/engine-render/src/scene.tsindex df0c8d67ce..44c3386986 100644--- a/packages/engine-render/src/scene.ts+++ b/packages/engine-render/src/scene.ts@@ -71,6 +71,7 @@ export class Scene extends Disposable {onTransformChange$ = new EventSubject<ITransformChangeState>();onFileLoaded$ = new EventSubject<string>();+ onClick$ = new EventSubject<IPointerEvent | IMouseEvent>();onPointerDown$ = new EventSubject<IPointerEvent | IMouseEvent>();onPointerMove$ = new EventSubject<IPointerEvent | IMouseEvent>();onPointerUp$ = new EventSubject<IPointerEvent | IMouseEvent>();@@ -939,7 +940,7 @@ export class Scene extends Disposable {this._transformer = null;this.onFileLoaded$.complete();-+ this.onClick$.complete();this.onPointerDown$.complete();this.onPointerMove$.complete();this.onPointerUp$.complete();@@ -1069,12 +1070,12 @@ export class Scene extends Disposable {return true;}- triggerPointerMove(evt: IPointerEvent | IMouseEvent) {+ triggerClick(evt: IPointerEvent | IMouseEvent) {if (- !this.onPointerMove$.emitEvent(evt)?.stopPropagation &&+ !this.onDblclick$.emitEvent(evt)?.stopPropagation &&this._parent.classType === RENDER_CLASS_TYPE.SCENE_VIEWER) {- (this._parent as SceneViewer)?.triggerPointerMove(evt);+ (this._parent as SceneViewer)?.triggerClick(evt);return false;}return true;@@ -1102,6 +1103,17 @@ export class Scene extends Disposable {return true;}+ triggerPointerMove(evt: IPointerEvent | IMouseEvent) {+ if (+ !this.onPointerMove$.emitEvent(evt)?.stopPropagation &&+ this._parent.classType === RENDER_CLASS_TYPE.SCENE_VIEWER+ ) {+ (this._parent as SceneViewer)?.triggerPointerMove(evt);+ return false;+ }+ return true;+ }+triggerPointerDown(evt: IPointerEvent | IMouseEvent) {if (!this.onPointerDown$.emitEvent(evt)?.stopPropagation &&